hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,887 commits 2 branches 0 tags 242 MiB
Commit graph

17,887 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
093b156c65 Merge pull request 'Switch Phoenix back to upstream' (#7803) from gitlab-mr-iid-4426 into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7803
 2026-05-14 09:21:36 +00:00
lain
c7c453ca21 Merge branch 'develop' into gitlab-mr-iid-4426 2026-05-14 06:56:57 +00:00
lain
0cf221ba13 Merge pull request 'Translations update from Pleroma Weblate' (#7866) from weblate into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7866
 2026-05-14 06:47:36 +00:00
lain
c5737898f5 Merge pull request 'Ensure only requests with Host header set to target instance pass through HTTP signatures.' (#7893) from phnt/pleroma:host-verification into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7893
 2026-05-14 06:44:56 +00:00
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
Codimp
d7a0d97c36 Translated using Weblate (French) 
Currently translated at 10.8% (106 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/fr/
 2026-05-13 20:08:05 +00:00
Codimp
086c15b5cd Translated using Weblate (French) 
Currently translated at 100.0% (80 of 80 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/fr/
 2026-05-13 20:08:05 +00:00
Neko Nekowazarashi
4fef910303 Added translation using Weblate (Indonesian) 2026-05-13 20:08:05 +00:00
Neko Nekowazarashi
526365364b Added translation using Weblate (Indonesian) 2026-05-13 20:08:05 +00:00
Neko Nekowazarashi
7fff19cbe4 Translated using Weblate (Indonesian) 
Currently translated at 77.8% (74 of 95 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/id/
 2026-05-13 20:08:05 +00:00
Irrlicht
143f426e84 Translated using Weblate (French) 
Currently translated at 10.8% (106 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/fr/
 2026-05-13 20:08:05 +00: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 Soykaf
8a56cf5c0f
 		Clarify websocket token precedence test 2026-05-11 22:19:45 +04:00
lain
8e72f4cd17 Merge branch 'develop' into gitlab-mr-iid-4426 2026-05-11 18:16:12 +00: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
ab9fd33762
 		Fix Phoenix upstream migration regressions 2026-05-11 22:14:01 +04: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
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