Mark Felder
354b700bed
Assert that AWS URLs without query parameters do not crash
2024-05-26 14:01:12 -04:00
lain
895eea5c75
Merge branch 'api-docs' into 'develop'
...
Update pleroma_api.md
See merge request pleroma/pleroma!4119
2024-05-25 07:17:05 +00:00
marcin mikołajczak
618b77071a
Update pleroma_api.md
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-25 09:12:37 +02:00
tusooa
19b2637c51
Merge branch 'bugfix/realpath-over-readlink' into 'develop'
...
pleroma_ctl: Use realpath(1) instead of readlink(1)
See merge request pleroma/pleroma!4118
2024-05-25 00:54:17 +00:00
lain
134f3bff67
Merge branch 'bump-elixir' into 'develop'
...
Bump minimum Elixir to 1.13
See merge request pleroma/pleroma!4014
2024-05-24 09:20:06 +00:00
Haelwenn (lanodan) Monnier
818712f99f
pleroma_ctl: Use realpath(1) instead of readlink(1)
...
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-23 00:39:53 +02:00
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 Soykaf
f5c0295247
CI: Specify correct image name.
2024-05-20 13:43:18 +04:00
Lain Soykaf
f8411a351d
CI: Specify version fully in base image tag
2024-05-20 13:30:31 +04:00
Lain Soykaf
226874c9d6
CI: Add new builders for base images
2024-05-20 13:12:12 +04:00
Lain Soykaf
ad26b6d593
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bump-elixir
2024-05-20 12:30:15 +04: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
