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

10,401 commits

Author SHA1 Message Date
nicole mikołajczyk
40bc79e5ce Merge pull request 'Various bookmark folders-related improvements' (#7829) from mkljczk/pleroma:bookmark-folders into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7829
 2026-03-06 16:50:30 +00:00
nicole mikołajczyk
a1bb81bddb Merge pull request 'Don't use the confusing TwitterAPI namespace' (#7841) from mkljczk/pleroma:twitter-api-removal into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7841
 2026-03-06 16:24:33 +00:00
nicole mikołajczyk
499b2ed118 remove unused alias 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-06 17:23:54 +01:00
nicole mikołajczyk
19025563e2 fixes 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 17:32:32 +01:00
nicole mikołajczyk
65c7d0c7b9 Merge pull request 'Update comment for prepare_object, rename prepare_outgoing' (#7818) from mkljczk/pleroma:update-comment into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7818
 2026-03-03 12:49:50 +00:00
nicole mikołajczyk
1b182b07dc is this what i was meant to do? 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 00:23:14 +01:00
nicole mikołajczyk
2086561fbd Various bookmark folders-related improvements 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-02 23:41:46 +01:00
nicole mikołajczyk
c3b779036d Merge branch 'develop' into pleroma-database-config-whitelist 2026-03-01 22:44:08 +00:00
nicole mikołajczyk
6405a2e682 Merge pull request 'Move avatar_description and header_description fields to the account object' (#7828) from mkljczk/pleroma:avatar-description-mastodon-api into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7828
 2026-03-01 22:40:01 +00:00
nicole mikołajczyk
120719f28c Don't use the confusing TwitterAPI namespace 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 19:53:25 +01:00
nicole mikołajczyk
a9b5a28c26 Do not use Enum.map for side-effects 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 16:24:10 +01:00
Phantasm
e32ab8aef2 DB prune: Check if user follows hashtag with no objects before deletion 2026-02-22 21:46:41 +00:00
nicole mikołajczyk
3d9ac413af Move avatar_description and header_description fields to the account object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-17 14:00:21 +01:00
nicole mikołajczyk
2e80c786bb Update comment for prepare_object, rename prepare_outgoing 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-10 14:37:30 +01:00
nicole mikołajczyk
cb78699a3b Merge branch 'instance-profile-fields' into 'develop' 
Add /api/v2/instance profile fields limits info used by Mastodon

See merge request pleroma/pleroma!4434
 2026-01-30 23:04:49 +01:00
nicole mikołajczyk
833e9829ba Merge branch 'relationship-expires-at' into 'develop' 
MastoAPI AccountView: Add mute/block expiry to the relationship object (simplified)

See merge request pleroma/pleroma!4433
 2026-01-30 07:08:21 +01:00
nicole mikołajczyk
bd30d461b0 Add /api/v2/instance profile fields limits info used by Mastodon 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-30 07:05:45 +01:00
nicole mikołajczyk
bc0c7fb310 Fix tests, relationship should always define _expires_at 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:58:33 +01:00
nicole mikołajczyk
6fac6ff7f1 MastoAPI AccountView: Add mute/block expiry to the relationship object 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 13:49:34 +01:00
nicole mikołajczyk
80ede85f75 Allow assigning users to reports 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 10:35:19 +01:00
Lain Soykaf
a4fb651fac ConfigController: Don't allow whitelist modification. 2026-01-17 13:30:07 +04:00
Lain Soykaf
117b0bd79e Config: Don't crash on falsy whitelist config 2026-01-17 13:03:02 +04: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
nicole mikołajczyk
b66b93a94a Add task for filtering non-whitelisted configs 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:35:22 +01:00
nicole mikołajczyk
1af8997462 do not ever allow setting database_config_whitelist to database 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:32:35 +01:00
Lain Soykaf
346014b897 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into revert-d6888e24 2026-01-16 22:43:10 +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
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 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
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
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
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
3ecc861fa7 StripLocation, ReadDescription: Silence noisy errors. 2026-01-08 13:40:25 +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
e671ca2554
 		Add Oban Web and upgrade LiveView, plug 2026-01-07 20:41:56 +01: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
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 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
bac607c7c0 Emoji: Unify tag building, fix tests. 2026-01-05 11:57:38 +04:00