Haelwenn (lanodan) Monnier
6f86883cca
Web: remove legacy :set_put_layout plug
...
Phoenix 1.8 requires a View module with put_layout so can't set it that early.
It was introduced in 2019 with
commit 1097ce6d9f
2026-01-18 10:40:10 +01:00
Haelwenn (lanodan) Monnier
be327ca982
Switch Phoenix back to upstream
...
See <https://github.com/phoenixframework/phoenix/pull/6094 >
for `:sec_websocket_protocol` -> `:sec_websocket_headers`
2026-01-18 10:40:10 +01: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
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
lain
3b99bbd955
Merge branch 'release/2.10' into 'stable'
...
Release/2.10
See merge request pleroma/pleroma!4413
2025-12-31 08:27:19 +00:00
Lain Soykaf
856bd7622e
GitlabCI: Fix.
2025-12-31 11:40:27 +04:00
Lain Soykaf
e1e16656ce
Merge in stable
2025-12-31 11:05:47 +04:00
Lain Soykaf
a5da6ce58e
Changelog: Update changelog
2025-12-31 10:49:28 +04:00
Lain Soykaf
92fc8f0012
Merge branch 'release/2.10' into release/2.10-sec
2025-12-29 17:08:46 +04:00
Lain Soykaf
b9e333c307
Frontend: Actually use the correct build.
2025-12-29 17:08:20 +04:00
Lain Soykaf
e204bc150e
Merge branch 'release/2.10' into release/2.10-sec
2025-12-29 09:49:53 +04:00
Lain Soykaf
c313c15d73
Mix: Fix version
2025-12-29 09:49:22 +04:00
Lain Soykaf
6c73ebe484
Merge branch 'phnt/mastoapi-misattribution-3381' into release/2.10-sec
2025-12-29 09:47:54 +04:00
Lain Soykaf
0127a10621
Changelog: Update changelog
2025-12-29 08:44:19 +04:00
Lain Soykaf
325c29c3fc
Static: Update bundled frontend to 2.10
2025-12-29 08:32:29 +04:00
Lain Soykaf
19add4036d
Mix: Bump version to 2.10
2025-12-29 08:23:14 +04:00
lain
d6888e24e4
Merge branch 'revert-cdd6df06' into 'develop'
...
Revert "Merge branch 'hackney-bump' into 'develop'"
See merge request pleroma/pleroma!4411
2025-12-26 05:08:43 +00:00
lain
23cb42a436
Revert "Merge branch 'hackney-bump' into 'develop'"
...
This reverts merge request !4409
2025-12-26 05:07:51 +00:00
Phantasm
38b3bff4e8
MastoAPI: Add more post attribution tests when fetched by Activity ID
...
Types returning 404:
- Accept
- Reject
- Delete
- Flag
- Follow
- Undo
Types returning posts:
- Create
- Update
- Like
- Announce
- EmojiReact
- Add/Remove
2025-12-25 20:40:21 +01:00
Phantasm
96de44b3d8
Tests AP Factory: fix featured collection factories
...
Internally it created Objects, tests passed Activities
2025-12-25 20:40:12 +01:00
lain
1a313fa30c
Merge branch 'replies_collection' into 'develop'
...
Provide full replies collection in ActivityPub objects (ported from akkoma)
See merge request pleroma/pleroma!4370
2025-12-25 10:22:53 +00:00
lain
cdd6df0621
Merge branch 'hackney-bump' into 'develop'
...
Update Hackney
See merge request pleroma/pleroma!4409
2025-12-25 09:25:23 +00:00
