lain
b90ac6b9c7
Merge branch 'develop' into host-verification
2026-05-14 06:01:31 +00:00
lain
5b63307f85
Merge pull request 'Use upstream remote_ip package' ( #7900 ) from issue-3314-remote-ip-hex into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7900
2026-05-14 05:47:32 +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
lain
e4ad3ab322
Merge pull request 'Use pleroma_captcha Hex package' ( #7901 ) from issue-7678-captcha-hex-1-0-3 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7901
2026-05-13 19:31:23 +00:00
Lain Soykaf
9ae1249ccb
Remove captcha dependency shape test
2026-05-13 23:09:29 +04: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
2db3a9c04d
Merge pull request 'Use Hex releases for majic and oban_plugins_lazarus' ( #7899 ) from issue-7686-majic-1-2-0 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7899
2026-05-13 15:32:09 +00:00
Lain Soykaf
d0c2d04356
Use Hex release for oban_plugins_lazarus
2026-05-13 19:10:15 +04:00
Lain Soykaf
d8e3ea69b1
Use Hex release for majic 1.2.0
2026-05-13 19:00:16 +04:00
Lain Soykaf
9e16332d9d
Update majic to 1.2.0
2026-05-13 18:39:40 +04:00
Phantasm
4810d2536e
ActivityPubController: Use valid signatures in Host header test
2026-05-13 12:16:27 +02: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
ffff2098f0
Merge pull request 'Signatures: Only true is true.' ( #7892 ) from bump/http-signatures-0.1.3 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7892
2026-05-13 06:09:06 +00:00
lain
e211b72924
Merge pull request 'Reject third-party remote reports' ( #7896 ) from fix/reject-third-party-reports into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7896
2026-05-13 05:57:34 +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
d8e9affded
Merge pull request 'Handle reports with just actor ap id as the object' ( #7897 ) from mkljczk/pleroma:iceshrimpnet-reports-fix into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7897
2026-05-12 23:08:23 +00: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
Phantasm
2b3ac2d7fe
lint
2026-05-13 00:44:33 +02:00
Phantasm
95eef879d7
ActivityPubController: add mismatched host test
2026-05-13 00:40:53 +02:00
Phantasm
c19bdf3814
SignatureRetryWorker: add mismatched host test, fix tests
2026-05-13 00:33:09 +02:00
Phantasm
95b15190de
ActivityPubController: require validated host header
2026-05-13 00:32:57 +02:00
Phantasm
6c2d8209c9
SignatureRetryWorker: require validated host header
2026-05-13 00:32:54 +02:00
Phantasm
6f415cf3fc
EnsureHostMatchesPlug: Remove match against default scheme port
...
Checking against the default port of the Endpoint URL scheme is
redundant as normal instances will have the combination https/443
by default created by pleroma.instance gen, Tor-only instances should
have combination http/80 and local testing instances httt/XXXX.
The default scheme port doesn't add anything usefull in these configs.
2026-05-12 23:31:55 +02:00
Lain Soykaf
0cf865f025
Reject third-party remote reports
2026-05-12 23:50:30 +04:00
Phantasm
35b5447f3f
EnsureHostMatchesPlug: Add more tests
2026-05-12 17:02:28 +02:00
Phantasm
90e390e45b
fix tests
2026-05-12 16:50:35 +02:00
Phantasm
d6d0ce7260
EnsureHostMatchesPlug: Add tests
2026-05-12 16:50:35 +02:00
Phantasm
ea886dc36b
EnsureHostMatchesPlug: Ensure Host header matches instance URI
2026-05-12 16:50:28 +02:00
lain
9b331d648b
Merge branch 'develop' into bump/http-signatures-0.1.3
2026-05-12 06:33:52 +00:00
Lain Soykaf
71afba4825
Signature: Treat HTTP signature errors as invalid
2026-05-12 08:52:42 +04:00
lain
960c730706
Merge pull request 'Update http_signatures to 0.1.3' ( #7891 ) from bump/http-signatures-0.1.3 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7891
2026-05-11 18:15:21 +00:00
Lain Soykaf
7f4890b6a9
Add changelog for http_signatures update
2026-05-11 21:12:34 +04:00
Lain Soykaf
61feb3dfcd
Update http_signatures to 0.1.3
2026-05-11 21:01:59 +04:00
lain
f579dc099c
Merge pull request 'Use published Pleroma MFM parser package' ( #7890 ) from lambadalambda/pleroma:mfm-backend-hex into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7890
2026-05-11 15:35:12 +00:00
Lain Soykaf
592be493c8
Use published Pleroma MFM parser package
2026-05-11 19:13:01 +04:00
lain
e1b2e788d9
Merge pull request 'Add backend MFM support' ( #7889 ) from lambadalambda/pleroma:mfm-backend into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7889
2026-05-11 13:30:03 +00:00
Lain Soykaf
47021b5aba
Fix MFM validator alias ordering
2026-05-11 16:37:59 +04:00
Lain Soykaf
c780298ce7
Add changelog for MFM support
2026-05-11 15:05:00 +04:00
Lain Soykaf
6b86e31e5d
Add backend MFM support
2026-05-11 14:53:06 +04:00
Phantasm
ebcc7684c1
Merge pull request 'Update Pleroma-FE build artifacts URL' ( #7885 ) from phnt/pleroma:fe-build-link into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7885
2026-05-06 13:56:10 +00:00
Phantasm
4873991983
Update Pleroma-FE build artifacts URL
2026-05-06 13:55:45 +00:00
lain
2082bf729a
Merge pull request 'poll_view: try to read votersCount first, and then manually count local voters.' ( #7883 ) from Yonle/pleroma:pf1 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7883
2026-05-06 09:55:03 +00:00
Lain Soykaf
c62d191986
Add changelog for votersCount inflation fix
2026-05-06 11:48:20 +04:00
lain
f1249d830f
Merge branch 'develop' into pf1
2026-05-06 07:45:50 +00:00
Lain Soykaf
727e9e7749
Fix votersCount inflation in multiple-choice polls
...
increase_vote_count/3 was incrementing votersCount on every vote
activity, causing inflation when a single voter picks multiple options.
Now only increments when the actor is a new unique voter, and preserves
existing votersCount otherwise.
Also adds is_integer guard to voters_count/1 to handle nil safely, and
adds tests for the voters_count clause ordering and edge cases.
2026-05-06 11:33:34 +04: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
Yonle
aec0deef8b
poll_view: try to read votersCount first, and then manually count local voters.
2026-05-05 13:50:11 +07:00
lain
4230887d7e
Merge pull request 'Prepare 2.10.2 release' ( #7880 ) from release/2.10.2 into develop
...
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7880
2026-05-03 16:27:21 +00:00
Lain Soykaf
8ccdd98914
Prepare 2.10.2 release
2026-05-03 20:23:35 +04:00
