Phantasm
a30298c1eb
StaticNotFoundPlug: Move 404 on non-existing static files to a new plug
...
This fixes preferred frontends not working (returning 404 on most static
frontend files).
2026-07-20 15:18:49 +00:00
Phantasm
6ec04af08c
Merge pull request 'Woodpecker CI: Build Vix in unit testing pipelines, do not build arm32v7 images in MRs' ( #7936 ) from ci-build-vix into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7936
2026-07-20 09:28:05 +00:00
Phantasm
ac08f0487f
Woodpecker CI: Do not build arm/v7 in PR, simplify
2026-07-20 11:17:09 +02:00
Phantasm
bde0e3e353
Woodpecker CI: Build Vix in unit test pipelines instead of downloading
2026-07-20 11:16:25 +02:00
Phantasm
a2eea6768c
Merge pull request 'Dockerfile: update base images to fix problems with SSL handshakes' ( #7930 ) from eal/pleroma:develop into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7930
2026-07-20 09:08:59 +00:00
Phantasm
e2f744bd68
Merge branch 'develop' into gitlab-mr-iid-4381
2026-07-18 20:47:03 +02:00
Phantasm
d383c453a1
Elixir 1.19: Added features changelog (ConfigDB blacklist)
2026-07-18 16:10:22 +02:00
eal
7de1affda8
Dockerfile: update base images to fix problems with SSL handshakes
...
My instance has been having problems with push federation since
updating to v2.10.2, using the docker image. Posts are not reaching
their destination instance until some other interaction initiates a
fetch from source.
The logs contain lots of errors such as:
```
pleroma | 09:34:40.885 [notice] TLS :client: In state :wait_cert_cr at ssl_handshake.erl:2158 generated CLIENT ALERT: Fatal - Unsupported Certificate
pleroma | - {:key_usage_mismatch,
pleroma | {{:Extension, {2, 5, 29, 15}, true, [:keyCertSign, :cRLSign]},
pleroma | {:Extension, {2, 5, 29, 37}, false, [{1, 3, 6, 1, 5, 5, 7, 3, 1}]}}}
```
This erlang/OTP issue seems to be the same problem:
https://github.com/erlang/otp/issues/9208
The erlang version committed here was selected after discussion in the
merge request.
I have not noticed any federation problems with an image built from
this dockerfile.
2026-07-18 11:15:45 +03:00
Phantasm
70c79ad512
Merge branch 'develop' into gitlab-mr-iid-4381
2026-06-30 00:31:51 +02:00
nicole mikołajczyk
b0ae451942
Merge pull request 'Allow attaching emojis to user lists' ( #7929 ) from mkljczk/pleroma:list-emoji into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7929
2026-06-29 12:51:43 +00:00
nicole mikołajczyk
c6d1cead83
Allow attaching emojis to user lists
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-06-23 16:08:52 +02:00
Phantasm
07c65adb0c
Grouped Notifications: Add feature flag to instance view and nodeinfo
2026-06-10 22:54:06 +02:00
lain
98cd1bbb9a
Merge pull request 'Add grouped notifications API' ( #7910 ) from issue-7905-grouped-notifications into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7910
Reviewed-by: Phantasm <phnt@noreply.git.pleroma.social>
2026-06-05 09:23:26 +00:00
lain
aa16f40f09
Merge pull request 'Prepared FE E2E Docker image' ( #7884 ) from docker-e2e-image into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7884
2026-05-25 12:33:27 +00:00
lain
33fdc59bc1
Merge branch 'develop' into issue-7887-featured-collection
2026-05-25 11:24:10 +00:00
lain
c8c1f7d38b
Merge pull request 'Fix Websockets streaming API pushing old already federated posts to TL' ( #7907 ) from websockets-necroposts into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7907
2026-05-25 10:25:36 +00:00
lain
619db0adca
Merge pull request 'Restore streaming WebSocket protocol tokens' ( #7908 ) from issue-3298-websocket-protocol into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7908
2026-05-25 08:06:52 +00:00
Phantasm
a5e7145c97
Merge pull request 'Woodpecker CI: Do not trigger on Weblate MRs' ( #7903 ) from phnt/pleroma:weblate-no-ci into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7903
2026-05-24 21:47:18 +00:00
Phantasm
ff7927e219
changelog
2026-05-24 23:41:59 +02:00
Lain Soykaf
add3844c6d
Persist notification group keys
2026-05-23 11:38:33 +04:00
Lain Soykaf
b054c2aa42
Fix paged featured collection fetches
2026-05-22 22:11:37 +04:00
Lain Soykaf
1e65c7a69e
Add grouped notifications API
2026-05-22 20:36:52 +04:00
Lain Soykaf
9dd02ecd50
Fix WebSocket protocol token handshakes
2026-05-22 16:30:14 +04:00
Henry Jameson
c428cf43e8
"changelog"
2026-05-18 21:07:12 +03:00
Phantasm
7575b7abc2
Woodpecker CI: Do not trigger on Weblate MRs
2026-05-14 12:34:27 +02:00
lain
4fe802b25a
Merge branch 'develop' into gitlab-mr-iid-4381
2026-05-14 09:27:13 +00:00
lain
c7c453ca21
Merge branch 'develop' into gitlab-mr-iid-4426
2026-05-14 06:56:57 +00:00
lain
b90ac6b9c7
Merge branch 'develop' into host-verification
2026-05-14 06:01:31 +00:00
Lain Soykaf
512b0f67a4
Merge remote-tracking branch 'origin/develop' into issue-3314-remote-ip-hex
...
# Conflicts:
# mix.exs
2026-05-14 09:27:18 +04:00
Phantasm
7651490c50
Merge branch 'develop' into gitlab-mr-iid-4381
2026-05-14 00:14:27 +02:00
Lain Soykaf
7ab9e2c7ce
Use pleroma_captcha Hex package
2026-05-13 23:05:25 +04:00
Lain Soykaf
c92d233233
Use upstream remote_ip package
2026-05-13 20:04:12 +04:00
Lain Soykaf
d0c2d04356
Use Hex release for oban_plugins_lazarus
2026-05-13 19:10:15 +04:00
Lain Soykaf
9e16332d9d
Update majic to 1.2.0
2026-05-13 18:39:40 +04:00
lain
47ca427497
Merge pull request 'Better user search' ( #7793 ) from gitlab-mr-iid-4416 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7793
2026-05-13 09:53:52 +00:00
Lain Soykaf
68e4bb53a2
Merge branch 'develop' into fix/reject-third-party-reports
2026-05-13 08:49:20 +04:00
nicole mikołajczyk
4d3aea1fce
Handle reports with just actor ap id as the object
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-05-13 00:56:56 +02:00
Lain Soykaf
0cf865f025
Reject third-party remote reports
2026-05-12 23:50:30 +04:00
Phantasm
ea886dc36b
EnsureHostMatchesPlug: Ensure Host header matches instance URI
2026-05-12 16:50:28 +02:00
lain
8e72f4cd17
Merge branch 'develop' into gitlab-mr-iid-4426
2026-05-11 18:16:12 +00:00
Lain Soykaf
216a00f73f
Merge develop into Phoenix upstream migration
2026-05-11 22:13:46 +04:00
Lain Soykaf
7f4890b6a9
Add changelog for http_signatures update
2026-05-11 21:12:34 +04:00
Lain Soykaf
c780298ce7
Add changelog for MFM support
2026-05-11 15:05:00 +04:00
Phantasm
4873991983
Update Pleroma-FE build artifacts URL
2026-05-06 13:55:45 +00:00
Lain Soykaf
c62d191986
Add changelog for votersCount inflation fix
2026-05-06 11:48:20 +04:00
Phantasm
3c63877e61
Add custom Docker image for FE E2E tests
...
Woodpecker cannot do custom commands for services.
2026-05-05 21:34:10 +02:00
lain
86a5213523
Merge pull request 'litepub-0.1.jsonld cleanup' ( #7871 ) from mkljczk/pleroma:context-cleanup into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7871
2026-05-05 08:22:29 +00:00
Lain Soykaf
8ccdd98914
Prepare 2.10.2 release
2026-05-03 20:23:35 +04:00
Lain Soykaf
78aef1b875
Merge branch 'stable' of ssh://git.pleroma.com/pleroma/pleroma into develop
2026-05-03 20:19:40 +04:00
Lain Soykaf
6553ba24aa
Prepare 2.10.1 release
2026-05-03 16:56:01 +04:00
