moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,003 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

16003 Commits

Author SHA1 Message Date
Lain Soykaf 5208bd8a95 Add changelog. 2023-11-12 15:00:51 +04:00
Lain Soykaf d3f8950588 B MeiliSearch, SearchIndexingWorker: Use Config.Getting, make tests async. 2023-11-12 14:49:50 +04:00
Lain Soykaf c1402af293 B Getting: Add default implementation, delegate, prepare test support. 2023-11-12 14:49:15 +04:00
Lain Soykaf 0c5cc51983 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch 2023-11-12 13:53:18 +04:00
Henry Jameson 637926dcbb Initial draft on frontends management 2023-11-10 13:58:25 +02:00
Marcin Mikołajczak 1e9333a9aa Merge remote-tracking branch 'origin/develop' into instance-v2 2023-11-08 20:46:57 +01:00
feld a51f3937ee Merge branch 'benchee' into 'develop' 
Ensure benchee doesn't run unless we are executing benchmarks

See merge request pleroma/pleroma!3972
 2023-11-08 18:27:08 +00:00
Mark Felder e23672d82f Ensure benchee doesn't run unless we are executing benchmarks 2023-11-08 12:44:57 -05:00
Mark Felder ef6d3dddd4 Fix changelogd grep syntax error 2023-11-08 12:28:23 -05:00
feld aef1a88dc6 Merge branch 'changelogd-fix' into 'develop' 
Fix changelogd grep syntax error

See merge request pleroma/pleroma!3973
 2023-11-08 17:28:14 +00:00
Mark Felder addc5408ff Fix changelogd grep syntax error 2023-11-08 12:27:46 -05:00
feld 17524865e5 Merge branch 'update_mr_template' into 'develop' 
Update MR template to include the type 'change'

See merge request pleroma/pleroma!3971
 2023-11-08 14:39:00 +00:00
Mark Felder 1810b2f477 Update MR template to include the type 'change' 2023-11-08 09:37:08 -05:00
Mark Felder 0ab853cab8 Merge branch 'develop' into phoenix1.7 2023-11-08 09:18:08 -05:00
feld 0f56304f09 Merge branch 'bare_uri_test' into 'develop' 
Activate test for object validator that has not been running

See merge request pleroma/pleroma!3968
 2023-11-08 14:13:37 +00:00
feld cfc01a660a Merge branch 'changelogd-change' into 'develop' 
changelogd: Support a type called "change"

See merge request pleroma/pleroma!3970
 2023-11-08 14:12:33 +00:00
Mark Felder e1bc95ae6e Support a type called "change" 2023-11-08 09:11:41 -05:00
Haelwenn (lanodan) Monnier 76c070fe86 ObjectValidators.BareUriTest: Replace calls of SafeText to BareUri 2023-11-08 02:17:50 +01:00
Mark Felder 9fa6531109 Phoenix is no longer required in extra_applications 2023-11-07 16:14:05 -05:00
Mark Felder a0e08c6ec2 Merge branch 'develop' into phoenix1.7 2023-11-07 16:05:04 -05:00
Mark Felder 8076deeeb4 Activate test for object validator that has not been running 2023-11-07 16:00:13 -05:00
feld 11c520607f Merge branch 'mailer-queue' into 'develop' 
Fix digest email processing, consolidate Oban queues

See merge request pleroma/pleroma!3966
 2023-11-07 20:45:48 +00:00
Mark Felder bf426c53b4 Fix digest email processing, consolidate Oban queues 
The email related jobs can all share a single Oban queue
 2023-11-07 15:14:36 -05:00
marcin mikołajczak c62696c8e7 Support /authorize-interaction route used by Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-11-02 13:47:23 +01:00
marcin mikołajczak 6b9a347353 update changelog 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-11-02 13:31:59 +01:00
marcin mikołajczak 50e7706b26 Verify link ownership with rel="me" 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-11-02 13:30:46 +01:00
tusooa 4c5b45ed73 Merge branch 'mergeback/2.6.0' into 'develop' 
mergeback: 2.6.0

Closes #3135

See merge request pleroma/pleroma!3964
 2023-11-01 03:19:05 +00:00
tusooa aaf53d9d77
Bump package version for mergeback 2023-10-31 20:49:31 -04:00
tusooa 6f654d534a Merge branch 'release/2.6.0' into 'stable' 
Release/2.6.0

See merge request pleroma/pleroma!3924
 2023-11-01 00:43:35 +00:00
tusooa ad45b06b3f Merge branch 'stable' into 'release/2.6.0' 
# Conflicts:
#   .gitlab-ci.yml
#   lib/pleroma/web/common_api/utils.ex
#   lib/pleroma/web/xml.ex
#   mix.exs
#   test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
#   test/pleroma/web/common_api/utils_test.exs
#   test/pleroma/web/mastodon_api/update_credentials_test.exs
#   test/pleroma/web/xml_test.exs
 2023-10-31 01:07:43 +00:00
tusooa ab894d98f4
Bundle 2.6.0 frontend 2023-10-29 12:59:03 -04:00
marcin mikołajczak e5bd1ee801 Add entry to @context, tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-29 00:02:17 +02:00
marcin mikołajczak 93370b870a Expose nonAnonymous field from Smithereen polls 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-28 23:58:39 +02:00
marcin mikołajczak c6cedbb810 InstanceV2: skip auth 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-28 00:07:18 +02:00
marcin mikołajczak 6b8c5e12df Add contact account to InstanceView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-26 23:32:08 +02:00
tusooa 6a13c2d180
Add collect-changelog script 2023-10-25 20:45:23 -04:00
tusooa a2a69709b5
Bump version to 2.6.0 2023-10-24 19:57:31 -04:00
marcin mikołajczak c03852fbc7 update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-25 00:38:52 +02:00
marcin mikołajczak 5ff3783d01 Use correct domain for fqn and InstanceView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-25 00:38:10 +02:00
Haelwenn e3ea311cd5 Merge branch 'tusooa/2810-punycode-mention' into 'develop' 
Fix mentioning punycode domains when using Markdown

Closes #2810

See merge request pleroma/pleroma!3925
 2023-10-18 01:20:00 +00:00
tusooa df0b56576a
Fix other quotation mark conversion tests 2023-10-16 21:35:37 -04:00
tusooa b748efe66a
Fix mentioning punycode domains when using Markdown 2023-10-16 21:35:25 -04:00
tusooa 340c881296 Merge branch 'tusooa/3018-unified-stream' into 'develop' 
Unified streaming endpoint

Closes #3018

See merge request pleroma/pleroma!3864
 2023-10-15 21:35:30 +00:00
tusooa eb33a03d0a
Explain the encode-decode roundtrip 2023-10-15 17:20:26 -04:00
tusooa 3e7d2e29b3
Add changelog 2023-10-15 17:20:26 -04:00
tusooa 840dd01035
Fix duplicated schema names 2023-10-15 17:20:26 -04:00
tusooa 32de0683c4
Fix unsubscribe event type in streaming doc 2023-10-15 17:20:26 -04:00
tusooa c13f0a8460
Add meta-info and query strings to streaming doc 2023-10-15 17:20:26 -04:00
tusooa f393a15dd1
Fix some specs about server-sent events in streaming 2023-10-15 17:20:26 -04:00
tusooa 8829dcaee4
Document client-sent events in streaming 2023-10-15 17:20:25 -04:00