summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-23pleroma_ctl: Use realpath(1) instead of readlink(1)Haelwenn (lanodan) Monnier
From realpath(1) in POSIX 202x Draft 4.1: > If file does not name a symbolic link, readlink shall write a diagnostic > message to standard error and exit with non-zero status. Which also doesn't includes `-f`, in preference of `realpath`.
2024-05-22Merge branch 'mergeback-2.6.3' into 'develop'lain
Mergeback 2.6.3 Closes #3245 See merge request pleroma/pleroma!4117
2024-05-22Merge branch 'stable' into developLain Soykaf
2024-05-22Merge branch 'release-2.6.3' into 'stable'lain
Release 2.6.3 See merge request pleroma/pleroma!4115
2024-05-22WebFingerControllerTest: Restore host after test.Lain Soykaf
2024-05-22changelogmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Fix testsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Fix validate_webfinger when running a different domain for Webfingermarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Revert "Webfinger: Allow managing account for subdomain"marcin mikołajczak
This reverts commit 84bb854056e406d5235dd442c28127891a8a8a86.
2024-05-22Merge branch 'webfinger-validation' into 'develop'lain
Fix validate_webfinger when running a different domain for Webfinger See merge request pleroma/pleroma!4116
2024-05-22WebFingerControllerTest: Restore host after test.Lain Soykaf
2024-05-22changelogmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Fix testsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Fix validate_webfinger when running a different domain for Webfingermarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22Revert "Webfinger: Allow managing account for subdomain"marcin mikołajczak
This reverts commit 84bb854056e406d5235dd442c28127891a8a8a86.
2024-05-22Collect changelogLain Soykaf
2024-05-22Mix: Update versionLain Soykaf
2024-05-22Webfinger: Allow managing account for subdomainLain Soykaf
2024-05-22Changelog: Adjust changelog typeLain Soykaf
2024-05-22Add changelogLain Soykaf
2024-05-22Webfinger: Fix testLain Soykaf
2024-05-22Prevent webfinger spoofingAlex Gleason
2024-05-22Webfinger: Add test showing wrong webfinger behaviorLain Soykaf
2024-05-22Merge branch 'fix-webfinger-spoofing' into 'develop'lain
Fix webfinger spoofing See merge request pleroma/pleroma!4114
2024-05-22Webfinger: Allow managing account for subdomainLain Soykaf
2024-05-22Changelog: Adjust changelog typeLain Soykaf
2024-05-22Add changelogLain Soykaf
2024-05-22Webfinger: Fix testLain Soykaf
2024-05-22Prevent webfinger spoofingAlex Gleason
2024-05-22Webfinger: Add test showing wrong webfinger behaviorLain Soykaf
2024-05-21Merge branch 'status-notification-type' into 'develop'lain
Add "status" notification type See merge request pleroma/pleroma!3659
2024-05-20Fix `get_notified_from`marcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-19Merge branch 'familiar-followers' into 'develop'lain
Implement `/api/v1/accounts/familiar_followers` See merge request pleroma/pleroma!4098
2024-05-19Merge branch 'mark-read' into 'develop'lain
PleromaAPI: Simplify marking notifications as read See merge request pleroma/pleroma!4111
2024-05-18PleromaAPI: marking notifications as read no longer returns notificationsMark Felder
2024-05-18Merge remote-tracking branch 'origin/develop' into status-notification-typemarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-16Merge branch 'revert-e944b152' into 'develop'feld
Revert "Merge branch 'strip-object-actor' into 'develop'" See merge request pleroma/pleroma!4112
2024-05-16Revert "Merge branch 'strip-object-actor' into 'develop'"feld
This reverts merge request !4105
2024-05-16Merge branch 'bad-mrf' into 'develop'feld
Startup detection for configured MRF modules that are missing or incorrectly defined See merge request pleroma/pleroma!4110
2024-05-16Startup detection for configured MRF modules that are missing or incorrectly ↵Mark Felder
defined
2024-05-15Merge branch 'strip-object-actor' into 'develop'feld
Strip actor from objects before federating Closes #3269 See merge request pleroma/pleroma!4105
2024-05-15Changelog for stripping actor from objectsMark Felder
2024-05-15Merge branch 'instance_rules' into 'develop'feld
Instance rules See merge request pleroma/pleroma!3669
2024-05-15Merge branch 'fix-muted-web-push' into 'develop'feld
Fix processing of Web Push and streaming notifications See merge request pleroma/pleroma!4032
2024-05-11Merge branch 'mastodon-instance-v2' into 'develop'feld
Add new values to /api/v2/instance Closes #3250 and #3251 See merge request pleroma/pleroma!4106
2024-05-11Merge branch 'develop' into fix-muted-web-pushMark Felder
2024-05-08Merge branch 'restore/card-img-alt' into 'develop'feld
Include image description in status media cards See merge request pleroma/pleroma!4108
2024-05-08Add test for StatusView rendering of Cards when missing descriptionsMark Felder
2024-05-08Improve StatusView tests for CardsMark Felder
2024-05-08Include image description in status media cardsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>