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

17,596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phantasm
54092d2b7c Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs 2026-01-25 05:46:28 +00:00
lain
a7a3978a20 Merge branch 'revert-d6888e24' into 'develop' 
Update Hackney, fix redirect issues

See merge request pleroma/pleroma!4412
 2026-01-17 11:09:27 +00:00
Lain Soykaf
e7d2d9bd89 mrf(media_proxy_warming): avoid adapter-level redirects 
Drop follow_redirect/force_redirect from the HTTP options used when warming MediaProxy, relying on Tesla middleware instead (Hackney redirect handling can crash behind CONNECT proxies).

Also add a regression assertion in the policy test and document the upstream Hackney issues in ReverseProxy redirect handling.
 2026-01-17 02:24:07 +04:00
Lain Soykaf
346014b897 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into revert-d6888e24 2026-01-16 22:43:10 +04:00
Lain Soykaf
1a6a8f6fb4 test(http): cover reverse proxy redirects via CONNECT proxy 
Exercises Pleroma.ReverseProxy.Client.Hackney with follow_redirect enabled behind an HTTPS CONNECT proxy, ensuring the client follows a relative redirect and can stream the final body.
 2026-01-16 22:14:27 +04:00
Mark Felder
9b1941366f In-house redirect handler for mediaproxy with Hackney adapter 
Also ensure we always pass an absolute URL to Hackney when parsing a redirect response

(cherry picked from commit 00ac6bce8d244eec7e2460358296619e5cacba6b)
 2026-01-16 22:14:27 +04:00
Lain Soykaf
e67b4cd8b2 test(http): reproduce hackney follow_redirect crash via CONNECT proxy 
Hackney 1.25 crashes when follow_redirect is enabled behind an HTTPS CONNECT proxy and the Location header is relative (hackney_http_connect transport).
This test demonstrates the failure and verifies Tesla-level redirects work when hackney redirects are disabled.
 2026-01-16 21:17:40 +04:00
Lain Soykaf
52fc344b0a test(http): cover pooled redirect with hackney 
Reproduces the Hackney 1.25 pooled redirect cleanup issue which can surface as :req_not_found when the adapter returns a Ref and the body is later fetched.
 2026-01-16 21:17:40 +04:00
Lain Soykaf
ef0f04ca48 http(hackney): disable adapter redirects by default 
Hackney 1.25.x has redirect handling issues behind CONNECT proxies and with pools.
Disable hackney-level redirects and rely on Tesla.Middleware.FollowRedirects instead.
Also default to with_body: true so redirects can be followed reliably.
 2026-01-16 21:17:40 +04:00
lain
c920241c04 Merge branch 'instance-domain-blocks' into 'develop' 
Add v1/instance/domain_blocks endpoint

See merge request pleroma/pleroma!4353
 2026-01-16 13:30:33 +00:00
Lain Soykaf
e91bb2144d InstanceView: Omit comment if it's empty 2026-01-16 16:17:21 +04:00
Lain Soykaf
656c4368d3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-instance-domain-blocks 2026-01-16 14:24:14 +04:00
lain
09aad75b33 Merge branch 'fix-oauth-app-registration' into 'develop' 
Change redirect_uris to accept array of strings

See merge request pleroma/pleroma!4423
 2026-01-16 10:21:41 +00:00
Lain Soykaf
4df7f93a23 Fix OAuth registration redirect_uris array support 2026-01-16 12:10:21 +04:00
lain
6001ed39fa Merge branch 'vix-0.36.0' into 'develop' 
mix: upgrade vix from `~> 0.26.0` to `~> 0.36`

Closes #3393

See merge request pleroma/pleroma!4424
 2026-01-14 06:48:00 +00:00
Haelwenn (lanodan) Monnier
05704ec86e
 		mix: upgrade vix from "~> 0.26.0" to "~> 0.36" 
Dropping the last zero should allow to get 0.x updates rather
than only 0.36.x updates.

Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/3393
 2026-01-14 03:11:37 +01:00
MediaFormat
12002830bc fix tests 2026-01-11 17:47:27 +00:00
lain
9fcf918e1c Merge branch 'phnt/oban-web' into 'develop' 
Add Oban Web and upgrade LiveView, plug

See merge request pleroma/pleroma!4422
 2026-01-11 05:40:47 +00:00
lain
c945a8a467 Merge branch 'less-flaky-tests' into 'develop' 
Less flaky tests

See merge request pleroma/pleroma!4421
 2026-01-11 05:38:17 +00:00
MediaFormat
87f3459f8c fix field type, fix formatting 2026-01-11 05:34:17 +00:00
MediaFormat
7da1d429a2 add changelog.d entry 2026-01-11 01:15:55 +00:00
MediaFormat
aa95855a7f Change redirect_uris to accept array of strings 2026-01-11 01:12:42 +00:00
Phantasm
5e114931f5
 		Move LiveDashboard to /pleroma/live_dashboard 2026-01-09 11:55:16 +01:00
Phantasm
39279292b2
 		Docs: Add admin documentation for LiveDashboard and Oban Web 2026-01-08 22:23:38 +01:00
Haelwenn
792d473778 Merge branch 'paginate-follow-requests' into 'develop' 
Paginate follow requests (adapted from Akkoma)

See merge request pleroma/pleroma!4420
 2026-01-08 10:25:45 +00:00
Lain Soykaf
4984aaa183 Streamer: Fix Marker streaming bug, fix caching in tests. 2026-01-08 14:06:24 +04:00
Lain Soykaf
0b498833cd Add changelog 2026-01-08 13:40:51 +04:00
Lain Soykaf
07b0e6c1dc Mix: Silence migrations 2026-01-08 13:40:43 +04:00
Lain Soykaf
3ecc861fa7 StripLocation, ReadDescription: Silence noisy errors. 2026-01-08 13:40:25 +04:00
Lain Soykaf
100cfe4db8 Config: Make streaming in tests actually synchronous 2026-01-08 13:39:55 +04:00
Phantasm
619ff5b9e3
 		Remove /pleroma/oban and /phoenix/live_dashboard from API routes 
This is needed to prevent admin frontend overrides from misbehaving when
overriding AdminFE located at /pleroma/admin, since API routes are
interpreted as the first portion of their full path, ie:
/api/v1/pleroma/admin -> /api
 2026-01-08 00:33:18 +01:00
Phantasm
30839063ef
 		changelog 2026-01-07 21:12:28 +01:00
Phantasm
e671ca2554
 		Add Oban Web and upgrade LiveView, plug 2026-01-07 20:41:56 +01:00
lain
2620b89cb5 Merge branch 'issue-3389-emoji-react-encode' into 'develop' 
Issue 3389 emoji react encode

See merge request pleroma/pleroma!4417
 2026-01-07 17:03:18 +00:00
nicole mikołajczyk
b2469404a9 Add changelog entry 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 16:07:45 +01:00
nicole mikołajczyk
7b134e7aa5 optimize follow_request_count for own account view 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 15:32:18 +01:00
floatingghost
0ec0ad8559 paginate follow requests (#460) 
matches https://docs.joinmastodon.org/methods/follow_requests/#get mostly

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/460
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-07 15:32:16 +01:00
Lain Soykaf
227c7fafa0 Tests: Syncify tests that mutate global state. 2026-01-07 17:59:37 +04:00
Lain Soykaf
9ed6d78cb5 Linting 2026-01-07 11:14:45 +04:00
Lain Soykaf
3ef98652f7 Emoji, AccountView, UtilController: Handle encoding of emoji 2026-01-07 10:40:45 +04:00
lain
f1d588fd6a Merge branch 'release-to-docker' into 'develop' 
Add Release-via-Docker option

See merge request pleroma/pleroma!4415
 2026-01-06 13:29:43 +00:00
Lain Soykaf
ee19d14b06 Linting 2026-01-06 15:38:15 +04:00
Lain Soykaf
19f3e2050e Emoji: Handle more edge cases for local emoji with strange filenames. 2026-01-06 15:12:49 +04:00
Lain Soykaf
2c20b3fc04 Add changelog 2026-01-05 12:12:21 +04:00
Lain Soykaf
bac607c7c0 Emoji: Unify tag building, fix tests. 2026-01-05 11:57:38 +04:00
Lain Soykaf
033618b25e TransmogrifierTest: Add failing test for EmojiReact url encoding 2026-01-05 11:57:02 +04:00
Lain Soykaf
009e63d20b Add changelog 2026-01-01 10:39:38 +04:00
Lain Soykaf
e3bdb8ef5d Release-to-Docker: Add unzip / curl to make updates work 2026-01-01 09:00:53 +04:00
lain
3d42219f12 Merge branch '2.10-mergeback' into 'develop' 
Stable mergeback

See merge request pleroma/pleroma!4414
 2025-12-31 14:56:45 +00:00
Lain Soykaf
db48aa5cdb Installation: Add Release-Via-Docker option 2025-12-31 18:52:14 +04:00