bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18090 commits 1 branch 0 tags 292 MiB
Commit graph

1400 commits

Author SHA1 Message Date
marcin mikołajczak
9f5325727e Merge branch 'fork' into backend-new 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-11-17 01:14:37 +01:00
marcin mikołajczak
831e95595c Merge remote-tracking branch 'origin/develop' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-11-12 12:24:08 +01:00
Codimp
1e9edccab8 Translated using Weblate (French) 
Currently translated at 5.4% (53 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/fr/
 2024-11-12 10:01:15 +00:00
marcin mikołajczak
9d6d528bcb Merge branch 'fork' into backend-new 2024-11-01 08:12:37 +01:00
marcin mikołajczak
c396c2cc47 Merge branch 'bites-pleroma' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-10-21 20:47:27 +02:00
marcin mikołajczak
f3825b676a Allow to bite users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-10-18 10:23:01 +02:00
marcin mikołajczak
2cdc1985a5 Visual updates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-10-13 15:39:13 +02:00
marcin mikołajczak
d580f81f27 Merge branch 'fork' into backend-new 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-10-12 23:57:31 +02:00
marcin mikołajczak
f3f01f4093 Change color for avatar border 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-17 13:48:45 +02:00
marcin mikołajczak
0366bb284c Fix migration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-16 11:42:09 +02:00
marcin mikołajczak
f01663fe6c Merge branch 'admin-report-notification-type' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-15 12:10:30 +02:00
marcin mikołajczak
455e3dea2e Use admin.report for report notification type 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-14 21:30:51 +02:00
marcin mikołajczak
7a2200faa8 Include Pleroma logo in .svg 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-12 11:19:54 +02:00
marcin mikołajczak
d74b5800e7 Merge remote-tracking branch 'mkljczk-pleroma/akkoma-migration' into fork 2024-09-11 22:09:24 +02:00
marcin mikołajczak
23f548dc61 Akkoma migration: Move mastofe settings to settings store 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-10 22:30:47 +02:00
marcin mikołajczak
ecf2c06e35 Akkoma rollbacks: Remove migrations used by pl 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-07 19:12:09 +02:00
marcin mikołajczak
da75554dec Merge remote-tracking branch 'mkljczk-pleroma/akkoma-migration' into fork 2024-09-07 19:11:14 +02:00
marcin mikołajczak
b0b674f47e Support migration from Akkoma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-07 19:07:16 +02:00
marcin mikołajczak
d2c5fd62ab Merge branch 'fork' into backend-new 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-06 23:23:59 +02:00
marcin mikołajczak
6c4d0e10c0 Merge remote-tracking branch 'origin/develop' into fork 2024-09-06 09:11:48 +02:00
Mark Felder
7bd0750787 Ensure apps are assigned to users 2024-09-04 10:40:37 -04:00
marcin mikołajczak
1d0b26c1cd prefer Pleroma assets 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-03 20:55:22 +02:00
marcin mikołajczak
f67e29b690 Merge branch 'scrubbers-allow-mention-hashtag' into fork 2024-09-02 12:40:58 +02:00
marcin mikołajczak
37397a43be scrubbers/default: Allow "mention hashtag" classes used by Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-02 12:39:29 +02:00
floatingghost
195e46bcca include local instance in bubble timeline (#117) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/117
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-31 14:59:46 +02:00
floatingghost
ffb0b79f69 Remerge of hashtag following (#341) 
this time with less idiot

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-31 14:22:39 +02:00
Oneric
23b2e044a5 Add ability to auto-approve followbacks 
Resolves: https://akkoma.dev/AkkomaGang/akkoma/issues/148
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-29 18:27:34 +02:00
marcin mikołajczak
bd079c7002 Merge branch 'bites' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-27 19:46:07 +02:00
marcin mikołajczak
5a32365d1d Allow to bite users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-27 17:33:03 +02:00
marcin mikołajczak
c6775e40c8 Update migration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-24 01:06:16 +02:00
marcin mikołajczak
8067388d77 Merge remote-tracking branch 'origin/develop' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-24 01:05:15 +02:00
Eric Zhang
16c6942df9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 28.1% (274 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
9e3fa89243 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
7b979ac09d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (50 of 50 strings)

Translation: Pleroma/Pleroma Backend (domain oauth_scopes)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-oauth_scopes/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
914fdc508d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
030be71307 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (100 of 100 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
73c6d7eaeb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
6ba1b79259 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
 2024-08-22 18:10:59 +00:00
Yating Zhan
1902323e97 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
743c4f2f5f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 19.8% (193 of 974 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2024-08-22 18:10:59 +00:00
Eric Zhang
99ace19ca9 Added translation using Weblate (Chinese (Simplified)) 2024-08-22 18:10:59 +00:00
marcin mikołajczak
22f41e5324 Merge branch 'fork' into backend-new 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-20 14:53:19 +02:00
marcin mikołajczak
0a4fece245 Merge remote-tracking branch 'origin/develop' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-14 18:16:28 +02:00
feld
a2490ddd9f Merge branch 'remove/workerhelper' into 'develop' 
Remove WorkerHelper

See merge request pleroma/pleroma!4166
 2024-08-07 13:26:41 +00:00
marcin mikołajczak
9a5a9a961d Merge remote-tracking branch 'origin/develop' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-02 14:58:05 +02:00
marcin mikołajczak
6f957c94a7 Merge remote-tracking branch 'origin/develop' into fork 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-08-02 14:46:20 +02:00
Lain Soykaf
574bc1fa5f Frontend: Update to 2.7.0 2024-08-01 11:49:36 +04:00
Mark Felder
b50261262e Fix publisher job migration error 2024-07-30 11:48:10 -04:00
Mark Felder
1d3a92be11 Remove :workers config from ConfigDB 2024-07-30 11:34:53 -04:00
feld
18469f3b1d Merge branch 'oban/simpler-publish' into 'develop' 
Publisher job simplification

See merge request pleroma/pleroma!4194
 2024-07-30 15:23:28 +00:00