d2c5fd62ab
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-06 23:23:59 +02:00
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
1d0b26c1cd
prefer Pleroma assets
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 20:55:22 +02:00
f67e29b690
Merge branch 'scrubbers-allow-mention-hashtag' into fork
2024-09-02 12:40:58 +02:00
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
bd079c7002
Merge branch 'bites' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-27 19:46:07 +02:00
5a32365d1d
Allow to bite users
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-27 17:33:03 +02:00
c6775e40c8
Update migration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-24 01:06:16 +02:00
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
22f41e5324
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-20 14:53:19 +02:00
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
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
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
Mark Felder
1bce582f0d
Fix migration crashing due to Oban not running
...
We can use Pleroma.Repo to fetch the jobs
2024-07-30 10:58:10 -04:00
Mark Felder
05d4989795
Insert replacement jobs in the new format if any remain undelivered
...
The old jobs remain and will fail gracefully
2024-07-29 14:00:46 -04:00
9d40689e47
update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-25 18:34:56 +02:00
Mark Felder
8f285a787f
Refactor backups to be fully controlled by Oban
2024-07-23 10:30:40 -04:00
15508da194
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-10 23:50:06 +02:00
Pleroma User
2967e5fa44
Translated using Weblate (Ukrainian)
...
Currently translated at 94.5% (86 of 91 strings)
Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-static_pages/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
4b7be135f0
Translated using Weblate (Ukrainian)
...
Currently translated at 16.2% (160 of 985 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
a8ad40dfd2
Translated using Weblate (Ukrainian)
...
Currently translated at 12.0% (6 of 50 strings)
Translation: Pleroma/Pleroma Backend (domain oauth_scopes)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-oauth_scopes/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
4d07b82f3e
Translated using Weblate (Ukrainian)
...
Currently translated at 94.5% (86 of 91 strings)
Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-static_pages/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
245f924009
Translated using Weblate (Ukrainian)
...
Currently translated at 65.9% (31 of 47 strings)
Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-posix_errors/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
ee528296ee
Translated using Weblate (Ukrainian)
...
Currently translated at 91.1% (31 of 34 strings)
Translation: Pleroma/Pleroma Backend (domain default)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-default/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
7406892940
Translated using Weblate (Ukrainian)
...
Currently translated at 15.7% (155 of 985 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-backend-domain-config_descriptions/uk/
2024-07-01 20:38:32 +00:00
Pleroma User
6c3df79299
Added translation using Weblate (Ukrainian)
2024-07-01 20:38:32 +00:00
Pleroma User
ad10750ba2
Added translation using Weblate (Ukrainian)
2024-07-01 20:38:32 +00:00
Pleroma User
35d64a8b64
Added translation using Weblate (Ukrainian)
2024-07-01 20:38:32 +00:00
14938d75f1
Merge branch 'fork' into backend-new
2024-06-30 23:16:20 +02:00
b1691732e9
scrub_html for translation results, allow 'ellipsis' and 'invisible' class names
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-30 23:09:36 +02:00
fc32646f7f
Merge branch 'fork' into backend-new
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-30 12:06:48 +02:00