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

907 commits

Author SHA1 Message Date
nicole mikołajczyk
490cd33bc9 Support lists exclusive param 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-03 12:48:37 +00:00
nicole mikołajczyk
68de463392 Merge pull request 'update mix.exs deps versions to match mix.lock so they don't look that scary' (#7839) from mkljczk/pleroma:mix-exs-update into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7839
Reviewed-by: Phantasm <phnt@noreply.git.pleroma.social>
 2026-03-02 23:37:01 +00:00
nicole mikołajczyk
37041aae60 update mix.exs deps versions to match mix.lock so they don't look that scary 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-03-02 22:50:49 +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
d389359ec3 Merge pull request 'mix.exs: use correct override value' (#7838) from mkljczk/pleroma:mix-exs-fix into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7838
 2026-03-01 22:42:17 +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
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
nicole mikołajczyk
938ee4cb01 mix.exs: use correct override value 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-02-27 15:45:57 +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
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
5001fb3a78 Update changelog 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-28 14:02:55 +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
Phantasm
54092d2b7c Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs 2026-01-25 05:46:28 +00: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
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
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
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
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
7da1d429a2 add changelog.d entry 2026-01-11 01:15:55 +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
0b498833cd Add changelog 2026-01-08 13:40:51 +04:00
Phantasm
30839063ef
 		changelog 2026-01-07 21:12:28 +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
Lain Soykaf
2c20b3fc04 Add changelog 2026-01-05 12:12:21 +04:00
Lain Soykaf
009e63d20b Add changelog 2026-01-01 10:39:38 +04:00
lain
e091349718 Revert "Merge branch 'revert-cdd6df06' into 'develop'" 
This reverts merge request !4411
 2025-12-26 05:08:52 +00:00
lain
23cb42a436 Revert "Merge branch 'hackney-bump' into 'develop'" 
This reverts merge request !4409
 2025-12-26 05:07:51 +00: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
Mark Felder
3f9466e3a9 Update Hackney, the default HTTP client, to the latest release which supports Happy Eyeballs for improved IPv6 federation 2025-12-23 11:44:21 -08:00
lain
2f48544937 Merge branch 'akkoma-fixes-1014-1018' into 'develop' 
Status visibility checks for post interactions, stop leaking internal Activity representation (Akkoma PR 1014 and 1018)

Closes #3383

See merge request pleroma/pleroma!4400
 2025-12-23 13:55:18 +00:00
Lain Soykaf
0f32134ea5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nginx-config-update 2025-12-22 13:51:25 +04:00
lain
1d366c0138 Merge branch 'transmogrifier/handle-as-public' into 'develop' 
Transmogrifier: convert "as:Public" to full w3 URL

See merge request pleroma/pleroma!4394
 2025-12-22 07:39:44 +00:00
lain
d19b992417 Merge branch 'webfinger-actual-fix' into 'develop' 
Fix WebFinger for split-domain setups

See merge request pleroma/pleroma!4405
 2025-12-22 07:38:55 +00:00
lain
985a0a28c7 Merge branch 'docs-rum-idx' into 'develop' 
Docs RUM: add OTP command, recommend vacuum after migration

See merge request pleroma/pleroma!4363
 2025-12-21 11:36:39 +00:00
lain
1d44640655 Merge branch 'relayd-ipv6' into 'develop' 
OpenBSD relayd: Fix IPv6 example

See merge request pleroma/pleroma!4408
 2025-12-21 10:24:38 +00:00
Phantasm
ed7ad7d96a
 		OpenBSD relayd: Fix IPv6 example 
relayd has problems loading certs when IPv4 and IPv6 listens are in the
same relay block.
 2025-12-17 19:11:20 +01:00
nicole mikołajczyk
e0ab2c9c9c Merge remote-tracking branch 'origin/develop' into mastodon-quote-id-api 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-12-17 13:43:45 +01:00
nicole mikołajczyk
c06fcc7f5d Merge branch 'order-favourites-reblogs' into 'develop' 
Order favourites and reblogs list from newest to oldest

See merge request pleroma/pleroma!4399
 2025-12-16 23:49:01 +01:00
nicole mikołajczyk
d41e2fbaaf Merge branch 'preferred-frontend' into 'develop' 
Port Akkoma frontend preference code

See merge request pleroma/pleroma!4398
 2025-12-16 20:54:00 +01:00
nicole mikołajczyk
8c9e130cc9 Merge branch 'description-improvement' into 'develop' 
Use :list_behaviour_implementations for LanguageDetector and Translation providers

See merge request pleroma/pleroma!4407
 2025-12-16 20:53:52 +01:00
nicole mikołajczyk
c6298be9f0 Merge branch 'scrobbles-scope' into 'develop' 
Add `write:scrobbles` and `read:scrobbles` scope for scrobbling

See merge request pleroma/pleroma!4379
 2025-12-16 20:53:32 +01:00