hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18,348 commits 2 branches 0 tags 250 MiB
Commit graph

1,281 commits

Author SHA1 Message Date
lain
9edce3a0a6 Merge pull request 'Merge stable 2.11.0 into develop' (#8009) from merge-stable-2.11.0 into develop 2026-10-24 07:52:45 +00:00
Lain Soykaf
9ea8d37e9f
 		Merge branch 'audit-mix-audit-report' (#69) into release/2.11 
# Conflicts:
#	lib/pleroma/http/adapter_helper/hackney.ex
 2026-10-22 16:37:08 +04:00
Lain Soykaf
1be50ed28b
 		fix(html): check link schemes the way browsers read them 
FastSanitize checks the scheme with URI.parse/1, which finds none in
java<TAB>script:alert(1). Browsers remove tabs and newlines and leading
control characters first and run it as a javascript: link. The scrubbers
now use Pleroma.HTML.URIAttributes, which normalizes the URL the same
way before the scheme check.
 2026-10-22 16:36:16 +04:00
Lain Soykaf
f4a3bc2300
 		Static: Update bundled frontend to 2.11.4 2026-10-22 11:23:51 +04:00
Mark Felder
9921e802c9 Delete legacy Postgres sequences 
for activities, chats, and users which were converted to Flake IDs
 2026-08-24 14:51:58 -07:00
Lain Soykaf
478b021fbe
 		fix(migrations): make Rebased rollback safe 2026-07-29 15:22:13 +04:00
nicole mikołajczyk
e1e853e8f7
 		Remove migration merged upstream 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-07-29 15:22:13 +04:00
mkljczk
253bbb80f5
 		Add rollback migrations for Rebased 
Signed-off-by: mkljczk <git@mkljczk.pl>
 2026-07-29 15:22:13 +04:00
Lain Soykaf
03e75d3b3e
 		fix(webhooks): merge develop and harden delivery 2026-07-26 17:00:14 +04:00
Lain Soykaf
99befcaf1b
 		fix(activitypub): deduplicate account favourites 2026-07-25 10:51:09 +04:00
nicole mikołajczyk
c6d1cead83 Allow attaching emojis to user lists 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-06-23 16:08:52 +02:00
lain
6f5ea55613 Merge pull request 'allow <center> (used by mfm)' (#7920) from mfm-center into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7920
 2026-06-05 09:24:15 +00:00
lain
98cd1bbb9a Merge pull request 'Add grouped notifications API' (#7910) from issue-7905-grouped-notifications into develop 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7910
Reviewed-by: Phantasm <phnt@noreply.git.pleroma.social>
 2026-06-05 09:23:26 +00:00
Henry Jameson
86dd9663fc allow <center> (used by mfm) 2026-06-01 22:06:45 +03:00
lain
f5f63bbc74 Merge branch 'develop' into webhooks 2026-05-26 05:15:23 +00:00
Lain Soykaf
1db2b99e48
 		Run group key migration before notification backfill 2026-05-23 14:00:17 +04:00
Lain Soykaf
add3844c6d
 		Persist notification group keys 2026-05-23 11:38:33 +04:00
hj
cda6738309 Update priv/scrubbers/default.ex 2026-05-22 20:47:52 +00:00
Henry Jameson
46a2808690 extraneous commas 2026-05-18 21:08:24 +03:00
Henry Jameson
1a13ec539b reorganize mfm attributes in order they're listed in misskey repo, add missing ones 2026-05-18 21:05:46 +03:00
lain
83dcc4ae36 Merge branch 'develop' into webhooks 2026-05-14 09:25:50 +00: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 Soykaf
6b86e31e5d
 		Add backend MFM support 2026-05-11 14:53:06 +04:00
lain
133fc64472 Merge branch 'develop' into webhooks 2026-05-06 07:53:46 +00:00
nicole mikołajczyk
c2fb145c5f litepub-0.1.jsonld cleanup 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-04-10 21:33:20 +02:00
Mark Felder
01ced6bea2 Fix the daily email digest job which was not executing 2026-04-01 11:59:23 -07:00
Mark Felder
f3f72048ac Fix MoveActivityExpirationsToOban migration 
This never would have worked correctly.

warning: Pleroma.Workers.PurgeExpiredActivity.enqueue/1 is undefined or private. Did you mean:

      * enqueue/2
 2026-03-25 12:21:51 -07:00
Mark Felder
2937bb68b1 Fix MoveTokensExpirationIntoOban migration 
Pleroma.Workers.PurgeExpiredToken.enqueue/1 no longer exists, so this migration would fail.

The enqueue/1 function is only used for this migration, so we can just include it in the
migration module directly.
 2026-03-25 12:21:13 -07:00
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
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
b9e333c307 Frontend: Actually use the correct build. 2025-12-29 17:08:20 +04:00
Lain Soykaf
325c29c3fc Static: Update bundled frontend to 2.10 2025-12-29 08:32:29 +04:00
HJ
de022de4ce Merge branch 'scrubber-span-classes' into 'develop' 
Allow "invisible" and "ellipsis" classes for span tags to match Mastodon behavior

See merge request pleroma/pleroma!4357
 2025-12-16 16:56:11 +00:00
HJ
cc14a7e33b Merge branch 'hj-develop-patch-37634' into 'develop' 
Allow FediIndex

See merge request pleroma/pleroma!4391
 2025-12-08 18:28:55 +00:00
nicole mikołajczyk
ca03d94f52 Merge branch 'pin-chats' into 'develop' 
Chats: pin/unpin chats

See merge request pleroma/pleroma!3637
 2025-11-29 18:45:42 +01:00
nicole mikołajczyk
e74b6ed348 Merge branch 'scrubber-inline-quotes-mastodon' into 'develop' 
Scrubber: Allow `quote-inline` class in <p> tags used by Mastodon quotes

See merge request pleroma/pleroma!4373
 2025-11-29 17:27:01 +01:00
nicole mikołajczyk
f61fad0663 Pin/unpin chats 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-11-29 16:53:56 +01:00
HJ
ca098a2bea Allow FediIndex 2025-10-29 16:47:59 +00:00
nicole mikołajczyk
2012e83e20 Allow filtering users with accepts_chat_messages capability 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-10-10 05:24:13 +02:00
nicole mikołajczyk
889938d76a Scrubber: Allow quote-inline class in <p> tags used by Mastodon quotes 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-10-10 05:21:49 +02:00
marcin mikołajczak
6d46aefb7f Add internal (not managable from API) webhooks 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-09-19 17:09:09 +02:00
nicole mikołajczyk
9d7bdab7a2 Mastodon-compatible webhooks 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-09-19 17:07:23 +02:00
nicole mikołajczyk
3be0d206bd Allow "invisible" and "ellipsis" classes for span tags to match Mastodon behavior 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-09-07 22:52:11 +02:00
Lain Soykaf
e2a9a4183f Update Pleroma-FE version to 2.9.2 2025-09-04 15:24:03 +04:00
feld
f38e9228ef Merge branch 'tusooa/assign-app-user-oom' into 'develop' 
Fix AssignAppUser migration OOM

Closes #3358

See merge request pleroma/pleroma!4326
 2025-06-07 19:39:57 +00:00