Phantasm
f672ab337c
Revert "Merge pull request 'MediaProxy: detect images when there's no file extension' ( #7933 ) from mediaproxy-content-type into develop"
...
A partial revert, keeping the updated @inline_content_types list and
cosmetic changes.
This reverts commit 4fe567064a , reversing
changes made to 9b8aa2e2ee .
2026-08-13 22:02:11 +02:00
nicole mikołajczyk
ad7f68b924
Merge pull request 'Embed notificaiton details for grouped move/reaction/chat/report notification' ( #7954 ) from mkljczk/pleroma:grouped-notifs-embed into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7954
2026-08-03 14:07:32 +00:00
nicole mikołajczyk
2876fed876
Embed notificaiton details for grouped move/reaction/chat/report notification
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-08-02 22:13:31 +02:00
lain
f53342775d
Merge pull request 'Add rollback migrations for Rebased' ( #7685 ) from gitlab-mr-iid-4308 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7685
2026-07-29 12:31:25 +00:00
Lain Soykaf
478b021fbe
fix(migrations): make Rebased rollback safe
2026-07-29 15:22:13 +04:00
nicole mikołajczyk
e1e853e8f7
Remove migration merged upstream
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-07-29 15:22:13 +04:00
mkljczk
2e59dcb9f6
style
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2026-07-29 15:22:13 +04:00
mkljczk
e516c43411
Add docs for Rebased migration
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2026-07-29 15:22:13 +04:00
mkljczk
253bbb80f5
Add rollback migrations for Rebased
...
Signed-off-by: mkljczk <git@mkljczk.pl>
2026-07-29 15:22:13 +04:00
lain
e143e645d3
Merge pull request 'OpenRC: Automatically run migrations before starting pleroma' ( #7680 ) from gitlab-mr-iid-4303 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7680
2026-07-29 11:07:32 +00:00
Lain Soykaf
8943ab8140
fix(openrc): preserve migration execution context
2026-07-29 15:02:16 +04:00
lain
1dd6a345bf
Merge pull request 'Respect activity restrictions in account statuses' ( #7943 ) from mkljczk/pleroma:issue-2604-restrict-account-statuses into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7943
2026-07-29 06:44:26 +00:00
Lain Soykaf
4a47a756be
fix(mastodon-api): optimize account status restrictions
2026-07-28 16:01:48 +04:00
nicole mikołajczyk
1bb5eca063
Merge pull request 'Fix typo in spec' ( #7947 ) from mkljczk/pleroma:typo into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7947
2026-07-28 10:41:05 +00:00
nicole mikołajczyk
5c85dadb29
Fix typo in spec
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-07-28 01:06:00 +02:00
lain
a45eb365ed
Merge pull request 'Abort incomplete media proxy responses' ( #7946 ) from lambadalambda/pleroma:fix/media-proxy-truncated-cache into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7946
2026-07-27 15:08:06 +00:00
lain
a22062a224
Merge pull request 'OAuth App: Fix test, optimize code.' ( #7692 ) from gitlab-mr-iid-4315 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7692
2026-07-27 14:42:53 +00:00
Lain Soykaf
bc999b3309
fix(media-proxy): abort truncated streams
2026-07-27 16:32:44 +04:00
lain
16581a2f6d
Merge pull request 'Update Debian and Ubuntu installation requirements' ( #7806 ) from gitlab-mr-iid-4429 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7806
2026-07-27 12:16:12 +00:00
Lain Soykaf
be5a3957b2
docs: explain libvips dependency
2026-07-27 16:12:21 +04:00
Lain Soykaf
3b71770cfa
docs: update Debian and Ubuntu requirements
2026-07-27 15:31:59 +04:00
Lain Soykaf
030c7e929c
style(oauth): use single alias directives
2026-07-27 12:14:58 +04:00
Lain Soykaf
d30d205f0b
fix(oauth): preserve dependent app cleanup
2026-07-27 11:57:16 +04:00
Lain Soykaf
b4c624911c
Merge branch 'develop' into gitlab-mr-iid-4315
2026-07-27 11:34:31 +04:00
lain
8ab0e046b1
Merge pull request 'Allow creating accounts without a password in the AdminAPI, update docs' ( #7937 ) from mkljczk/pleroma:admin-api-passwordless-user-creation into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7937
2026-07-27 07:17:14 +00:00
Phantasm
ea49ad121e
Merge pull request 'Fix missing readme logo' ( #7945 ) from readme-logo-fix into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7945
2026-07-26 19:18:24 +00:00
Phantasm
6132c9e88a
Fix missing readme logo
2026-07-26 21:14:29 +02:00
Lain Soykaf
2b32e3cf1f
fix(mastodon-api): restrict unauthenticated account statuses
2026-07-26 18:12:49 +04:00
lain
fd2074a30d
Merge pull request 'Mastodon-compatible webhooks' ( #7844 ) from mkljczk/pleroma:webhooks into develop
2026-07-26 13:10:48 +00:00
Lain Soykaf
03e75d3b3e
fix(webhooks): merge develop and harden delivery
2026-07-26 17:00:14 +04:00
lain
b9ef1e2182
Merge pull request 'Restore preview cards tests and update their OpenAPI description' ( #7444 ) from gitlab-mr-iid-4067 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7444
2026-07-26 10:32:26 +00:00
lain
e210e16a37
Merge pull request 'MastoAPI: /api/{v1,v2}/admin/accounts, /api/v1/admin/reports' ( #7842 ) from mkljczk/pleroma:mastodon-admin-api into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7842
2026-07-26 10:06:01 +00:00
Lain Soykaf
842e6bcaff
Merge remote-tracking branch 'origin/develop' into pr-7444-finish
2026-07-26 13:56:09 +04:00
Lain Soykaf
c591ca518c
fix(mastodon-api): finish preview card compatibility
2026-07-26 13:55:57 +04:00
Lain Soykaf
55c20c0fe8
test(mastodon-api): avoid relationship expiry races
2026-07-26 13:54:28 +04:00
lain
2ce6e5f49d
Merge pull request 'Add ParadeDB search backend' ( #7849 ) from paradedb-search-backend into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7849
2026-07-26 09:28:06 +00:00
Lain Soykaf
458a15bf9f
fix(mastodon-api): harden admin moderation actions
2026-07-26 13:24:03 +04:00
Lain Soykaf
7a741736ea
Merge remote-tracking branch 'origin/develop' into pr-7444-finish
2026-07-26 13:20:50 +04:00
lain
3c916891f6
Merge branch 'develop' into paradedb-search-backend
2026-07-26 09:15:42 +00:00
lain
a5aad47cff
Merge branch 'develop' into mastodon-admin-api
2026-07-26 08:52:01 +00:00
lain
d115b41848
Merge pull request 'Reject unsupported HTTP Message Signatures' ( #7918 ) from activitypub-bot-federation into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7918
2026-07-26 08:50:16 +00:00
lain
34172673d8
Merge pull request 'Accept more ActivityPub object variants from fedidev.fun samples' ( #7805 ) from gitlab-mr-iid-4428 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7805
2026-07-26 08:50:03 +00:00
Lain Soykaf
6e73d043ef
test(config): exclude static fixture from test loader
2026-07-26 12:40:38 +04:00
lain
f5dd75b1a3
Merge branch 'develop' into activitypub-bot-federation
2026-07-26 08:36:46 +00:00
Lain Soykaf
ce5c1b4c15
fix(activitypub): harden object normalization
2026-07-26 12:35:09 +04:00
Lain Soykaf
cece76e4cb
docs(search): document ParadeDB operations
2026-07-26 12:32:24 +04:00
Lain Soykaf
9df50eea82
fix: reject duplicate Signature headers
2026-07-26 12:26:35 +04:00
Lain Soykaf
f90a52398b
ci(search): gate pinned ParadeDB integration
2026-07-26 12:16:04 +04:00
Lain Soykaf
13c944a04b
fix(search): index remote attachment descriptions
2026-07-26 12:03:24 +04:00
Lain Soykaf
271c3a3dd8
fix(config): keep search startup settings static
2026-07-26 11:58:31 +04:00