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

16089 Commits

Author SHA1 Message Date
lain 05b9805bf9 Merge branch 'mergeback-2.6.3' into 'develop' 
Mergeback 2.6.3

Closes #3245

See merge request pleroma/pleroma!4117
 2024-05-22 15:48:42 +00:00
Lain Soykaf 3f0e9fd474 Merge branch 'stable' into develop 2024-05-22 19:47:15 +04:00
lain 7566b4a348 Merge branch 'release-2.6.3' into 'stable' 
Release 2.6.3

See merge request pleroma/pleroma!4115
 2024-05-22 15:17:36 +00:00
Lain Soykaf 53a3176d24 WebFingerControllerTest: Restore host after test. 2024-05-22 19:09:26 +04:00
marcin mikołajczak c42527dc2e changelog 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 19:09:16 +04:00
marcin mikołajczak 45b5e6ecd8 Fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 19:09:07 +04:00
marcin mikołajczak b245a5c8c2 Fix validate_webfinger when running a different domain for Webfinger 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 18:59:14 +04:00
marcin mikołajczak 50ffbd980e Revert "Webfinger: Allow managing account for subdomain" 
This reverts commit 84bb854056.
 2024-05-22 18:59:07 +04:00
lain a8e1fc0f6a Merge branch 'webfinger-validation' into 'develop' 
Fix validate_webfinger when running a different domain for Webfinger

See merge request pleroma/pleroma!4116
 2024-05-22 14:58:48 +00:00
Lain Soykaf 5f1f574f01 WebFingerControllerTest: Restore host after test. 2024-05-22 18:45:34 +04:00
marcin mikołajczak d536d58080 changelog 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 15:54:17 +02:00
marcin mikołajczak 70cabbf6dc Fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 15:53:16 +02:00
marcin mikołajczak d0b18e338b Fix validate_webfinger when running a different domain for Webfinger 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-22 15:52:35 +02:00
marcin mikołajczak 1f2f7e044d Revert "Webfinger: Allow managing account for subdomain" 
This reverts commit 84bb854056.
 2024-05-22 15:52:10 +02:00
Lain Soykaf 7b4e6d4c16 Collect changelog 2024-05-22 17:44:10 +04:00
Lain Soykaf 239c9c3f1c Mix: Update version 2024-05-22 17:40:20 +04:00
Lain Soykaf 20fa400082 Webfinger: Allow managing account for subdomain 2024-05-22 17:38:23 +04:00
Lain Soykaf 2212287b00 Changelog: Adjust changelog type 2024-05-22 17:38:16 +04:00
Lain Soykaf 275fdb26c1 Add changelog 2024-05-22 17:38:08 +04:00
Lain Soykaf eafcb7b4ec Webfinger: Fix test 2024-05-22 17:38:03 +04:00
Alex Gleason 364f6e1620 Prevent webfinger spoofing 2024-05-22 17:37:57 +04:00
Lain Soykaf 29b968ce20 Webfinger: Add test showing wrong webfinger behavior 2024-05-22 17:37:49 +04:00
lain c8e5a1f6b0 Merge branch 'fix-webfinger-spoofing' into 'develop' 
Fix webfinger spoofing

See merge request pleroma/pleroma!4114
 2024-05-22 12:45:24 +00:00
Lain Soykaf 84bb854056 Webfinger: Allow managing account for subdomain 2024-05-22 15:12:29 +04:00
Lain Soykaf 91c93ce3cd Changelog: Adjust changelog type 2024-05-22 13:14:59 +04:00
Lain Soykaf 4491e8c9a3 Add changelog 2024-05-22 13:01:23 +04:00
Lain Soykaf 206ea92837 Webfinger: Fix test 2024-05-22 12:59:10 +04:00
Alex Gleason b15f8b0642 Prevent webfinger spoofing 2024-05-22 12:57:45 +04:00
Lain Soykaf d1b053f3ba Webfinger: Add test showing wrong webfinger behavior 2024-05-22 12:57:30 +04:00
lain 7fca598268 Merge branch 'status-notification-type' into 'develop' 
Add "status" notification type

See merge request pleroma/pleroma!3659
 2024-05-21 05:01:45 +00:00
marcin mikołajczak 36fa0debfe Fix `get_notified_from` 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-20 23:25:50 +02:00
lain e8cd6662eb Merge branch 'familiar-followers' into 'develop' 
Implement `/api/v1/accounts/familiar_followers`

See merge request pleroma/pleroma!4098
 2024-05-19 12:05:55 +00:00
lain 401aca2548 Merge branch 'mark-read' into 'develop' 
PleromaAPI: Simplify marking notifications as read

See merge request pleroma/pleroma!4111
 2024-05-19 07:48:32 +00:00
Mark Felder d07d49227f PleromaAPI: marking notifications as read no longer returns notifications 2024-05-18 18:17:35 +00:00
marcin mikołajczak 2e76ceb5b4 Merge remote-tracking branch 'origin/develop' into status-notification-type 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-18 11:30:25 +02:00
feld 99eab1fa2a Merge branch 'revert-e944b152' into 'develop' 
Revert "Merge branch 'strip-object-actor' into 'develop'"

See merge request pleroma/pleroma!4112
 2024-05-16 23:34:00 +00:00
feld 9988dc2227 Revert "Merge branch 'strip-object-actor' into 'develop'" 
This reverts merge request !4105
 2024-05-16 23:33:48 +00:00
feld 7de657ac45 Merge branch 'bad-mrf' into 'develop' 
Startup detection for configured MRF modules that are missing or incorrectly defined

See merge request pleroma/pleroma!4110
 2024-05-16 20:37:37 +00:00
Mark Felder 7f8a9329e5 Startup detection for configured MRF modules that are missing or incorrectly defined 2024-05-16 16:13:29 -04:00
feld e944b15298 Merge branch 'strip-object-actor' into 'develop' 
Strip actor from objects before federating

Closes #3269

See merge request pleroma/pleroma!4105
 2024-05-15 20:51:47 +00:00
Mark Felder 2965ed47bd Changelog for stripping actor from objects 2024-05-15 16:40:31 -04:00
feld 53ef576739 Merge branch 'instance_rules' into 'develop' 
Instance rules

See merge request pleroma/pleroma!3669
 2024-05-15 20:29:04 +00:00
feld 8da103da57 Merge branch 'fix-muted-web-push' into 'develop' 
Fix processing of Web Push and streaming notifications

See merge request pleroma/pleroma!4032
 2024-05-15 20:12:41 +00:00
feld c954437cc0 Merge branch 'mastodon-instance-v2' into 'develop' 
Add new values to /api/v2/instance

Closes #3250 and #3251

See merge request pleroma/pleroma!4106
 2024-05-11 12:11:00 +00:00
Mark Felder 16c72d0701 Merge branch 'develop' into fix-muted-web-push 2024-05-11 08:06:04 -04:00
feld 6cfb0d7ddb Merge branch 'restore/card-img-alt' into 'develop' 
Include image description in status media cards

See merge request pleroma/pleroma!4108
 2024-05-08 17:55:32 +00:00
Mark Felder ccceb41bf3 Add test for StatusView rendering of Cards when missing descriptions 2024-05-08 13:54:57 -04:00
Mark Felder 5e7f4f687e Improve StatusView tests for Cards 2024-05-08 13:52:25 -04:00
marcin mikołajczak 818d9f7b63 Include image description in status media cards 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-08 13:40:26 -04:00
feld 8eea4f58c7 Merge branch 'rich-media-db' into 'develop' 
RichMedia refactor

See merge request pleroma/pleroma!4057
 2024-05-08 03:12:09 +00:00