f4c0a01f09
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into image-description-summary
2024-05-27 20:03:14 +04:00
7798fdc711
Merge branch 'show-reposted-replies' into 'develop'
...
Display reposted replies with exclude_replies: true
See merge request pleroma/pleroma!3961
2024-05-27 15:33:50 +00:00
e93ae96e13
Merge branch 'nsfw-api-mrf' into 'develop'
...
NSFW API Policy
See merge request pleroma/pleroma!3471
2024-05-27 15:20:43 +00:00
d11ba9e85b
Merge branch 'ipfs_uploader' into 'develop'
...
feat: simple, but not stupid, uploader for IPFS
See merge request pleroma/pleroma!3654
2024-05-27 15:06:12 +00:00
ed93af64e1
Add changelog
2024-05-27 17:50:34 +04:00
4325b1aec3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nsfw-api-mrf
2024-05-27 17:49:31 +04:00
3055c1598b
IPFSTest: Fix configuration mocking
2024-05-27 17:22:18 +04:00
825b4122a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-ipfs_uploader
2024-05-27 16:23:40 +04:00
6757382abe
Merge branch 'reject-replies-to-deleted' into 'develop'
...
Return a 422 when trying to reply to a deleted status
See merge request pleroma/pleroma!4122
2024-05-27 11:41:46 +00:00
f214c2cdac
NotificationTest: Remove impossible case.
2024-05-27 15:23:33 +04:00
4d6316b488
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject-replies-to-deleted
2024-05-27 15:19:53 +04:00
5e43060128
Merge branch 'search-healthcheck' into 'develop'
...
Search backend healthcheck process
See merge request pleroma/pleroma!4120
2024-05-27 09:46:57 +00:00
d35b69d268
Pleroma.Search: Remove wrong (but irrelevant) results
2024-05-27 13:18:02 +04:00
d9b82255b9
Add an HTTP timeout for the healthcheck
2024-05-26 15:23:12 -04:00
d4769b076a
Return a 422 when trying to reply to a deleted status
2024-05-26 15:14:48 -04:00
c3c804b71f
Merge branch 'fix/rich-media-ttl' into 'develop'
...
Fix rich media parsing some Amazon URLs
See merge request pleroma/pleroma!4121
2024-05-26 18:29:46 +00:00
03f4b46189
Test that healthchecks behave correctly for the expected HTTP responses
2024-05-26 14:21:24 -04:00
f2b0d5f1d0
Make it easier to read the state for debugging purposes and expose functions for testing
2024-05-26 14:11:41 -04:00
807782b7f9
Fix rich media parsing some Amazon URLs
2024-05-26 14:02:20 -04:00
354b700bed
Assert that AWS URLs without query parameters do not crash
2024-05-26 14:01:12 -04:00
3474b42ce3
Drop TTL to 5 seconds
2024-05-25 16:55:29 -04:00
61a3b79316
Search backend healthcheck process
2024-05-25 16:07:47 -04:00
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
618b77071a
Update pleroma_api.md
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-25 09:12:37 +02:00
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
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
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
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
3f0e9fd474
Merge branch 'stable' into develop
2024-05-22 19:47:15 +04:00
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
53a3176d24
WebFingerControllerTest: Restore host after test.
2024-05-22 19:09:26 +04:00
c42527dc2e
changelog
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 19:09:16 +04:00
45b5e6ecd8
Fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 19:09:07 +04:00
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
50ffbd980e
Revert "Webfinger: Allow managing account for subdomain"
...
This reverts commit 84bb854056
2024-05-22 18:59:07 +04:00
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
5f1f574f01
WebFingerControllerTest: Restore host after test.
2024-05-22 18:45:34 +04:00
d536d58080
changelog
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 15:54:17 +02:00
70cabbf6dc
Fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 15:53:16 +02:00
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
1f2f7e044d
Revert "Webfinger: Allow managing account for subdomain"
...
This reverts commit 84bb854056
2024-05-22 15:52:10 +02:00
7b4e6d4c16
Collect changelog
2024-05-22 17:44:10 +04:00
239c9c3f1c
Mix: Update version
2024-05-22 17:40:20 +04:00
20fa400082
Webfinger: Allow managing account for subdomain
2024-05-22 17:38:23 +04:00
2212287b00
Changelog: Adjust changelog type
2024-05-22 17:38:16 +04:00
275fdb26c1
Add changelog
2024-05-22 17:38:08 +04:00
eafcb7b4ec
Webfinger: Fix test
2024-05-22 17:38:03 +04:00
364f6e1620
Prevent webfinger spoofing
2024-05-22 17:37:57 +04:00
29b968ce20
Webfinger: Add test showing wrong webfinger behavior
2024-05-22 17:37:49 +04:00
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