ilja/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
15247 commits 9 branches 72 tags 311 MiB
Commit graph

1251 commits

Author SHA1 Message Date
Weblate
8bca9a7dbe Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
Weblate
fcb5e4a48d Translated using Weblate (Dutch) 
Currently translated at 100.0% (83 of 83 strings)

Added translation using Weblate (Dutch)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/nl/
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
Weblate
b1e2f3f646 Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
Weblate
2f074a6966 Translated using Weblate (Catalan) 
Currently translated at 2.9% (30 of 1002 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
Weblate
fd35a66312 Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
Weblate
5022ecd766 Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-11 09:29:28 +00:00
floatingghost
62e179f446 make conversation-id deterministic (#154) 
Reviewed-on: AkkomaGang/akkoma#154
 2022-08-06 20:59:15 +00:00
FloatingGhost
e8806fdc42 allow quote-inline span class 2022-08-05 20:35:00 +01:00
floatingghost
0ec3a11895 don't persist undo of follows (#149) 
Reviewed-on: AkkomaGang/akkoma#149
 2022-08-05 13:28:56 +00:00
FloatingGhost
9df732c42b Merge branch 'translations' into develop 2022-08-03 22:05:23 +01:00
floatingghost
c9600dbbbf local-only-fixed (#138) 
Reviewed-on: AkkomaGang/akkoma#138
 2022-08-02 14:46:46 +00:00
Weblate
8b14b65e39 Merge branch 'origin/develop' into Weblate. 2022-08-01 12:48:29 +00:00
floatingghost
55b86e45ec Merge pull request 'translations' (#133) from translations into develop 
Reviewed-on: AkkomaGang/akkoma#133
 2022-08-01 12:48:26 +00:00
Weblate
dbb80c79d5 Translated using Weblate (Catalan) 
Currently translated at 100.0% (103 of 103 strings)

Translated using Weblate (Catalan)

Currently translated at 0.3% (4 of 1002 strings)

Translated using Weblate (Catalan)

Currently translated at 100.0% (83 of 83 strings)

Translated using Weblate (Catalan)

Currently translated at 13.5% (14 of 103 strings)

Added translation using Weblate (Catalan)

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Catalan)

Currently translated at 100.0% (0 of 0 strings)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/ca/
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translation: Pleroma fe/Akkoma Backend (Errors)
Translation: Pleroma fe/Akkoma Backend (Static pages)
 2022-08-01 12:47:27 +00:00
floatingghost
19a27ff006 allow small/center tags in misskeymarkdown (#132) 
Reviewed-on: AkkomaGang/akkoma#132
 2022-08-01 12:46:52 +00:00
Weblate
c0965ed24a Added translation using Weblate (Catalan) 
Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Catalan)

Currently translated at 100.0% (0 of 0 strings)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
 2022-07-29 11:37:51 +00:00
Weblate
f4b507f3a2 Translated using Weblate (Catalan) 
Currently translated at 100.0% (0 of 0 strings)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Added translation using Weblate (Catalan)

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/ca/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
 2022-07-28 12:12:55 +00:00
floatingghost
2796a9acaf backend-i18n (#121) 
Reviewed-on: AkkomaGang/akkoma#121
 2022-07-27 21:56:59 +00:00
floatingghost
1419eee5df Quote posting (#113) 
Reviewed-on: AkkomaGang/akkoma#113
 2022-07-25 16:30:06 +00:00
floatingghost
54ed8760ff Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) 
Reviewed-on: AkkomaGang/akkoma#85
 2022-07-18 13:08:36 +00:00
floatingghost
3cbc401fe0 upgrade oban to v11 (#84) 
Reviewed-on: AkkomaGang/akkoma#84
 2022-07-18 10:48:49 +00:00
FloatingGhost
17ea24838b Add avatar image file 2022-07-18 11:25:09 +01:00
floatingghost
d2a185c013 Documentation updates for stable release (#73) 
Reviewed-on: AkkomaGang/akkoma#73
 2022-07-15 12:27:16 +00:00
Norm
b2ce8fcc77 Change pleroma reference in priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE 2022-07-12 16:20:53 -04:00
floatingghost
82fa766ed7 Remove precompiled javascript (#55) 
Reviewed-on: AkkomaGang/akkoma#55
 2022-07-08 13:03:18 +00:00
Pete
56203aae30 Add index hotspots 2022-07-01 13:59:26 +01:00
FloatingGhost
1ecdb19de5 Refactor ES on top of search behaviour 2022-06-30 16:28:31 +01:00
Tusooa Zhu
2df25e6666 Support fallbacking to other languages 2022-06-29 20:47:10 +01:00
Tusooa Zhu
7726148472 Send emails i18n'd using backend-stored user language 2022-06-29 20:45:19 +01:00
Tusooa Zhu
c301a95276 Make all emails translatable 2022-06-29 20:45:05 +01:00
Tusooa Zhu
63a0536d55 Make mail and mailer translatable 2022-06-29 20:45:05 +01:00
Tusooa Zhu
39cfecb188 Make static fe translatable 2022-06-29 20:45:05 +01:00
Tusooa Zhu
c6652fccae Make mfa pages translatable 2022-06-29 20:45:03 +01:00
Tusooa Zhu
8f8d2abb12 Make oauth pages translatable 2022-06-29 20:44:48 +01:00
Tusooa Zhu
ec57e3480c Make tag feed translatable 2022-06-29 20:44:16 +01:00
Tusooa Zhu
50913c4dc5 Make password reset pages translatable 2022-06-29 20:44:16 +01:00
Tusooa Zhu
7107fdc1b9 Extract translatable text 2022-06-29 20:44:16 +01:00
FloatingGhost
f919035664 update adminfe 2022-06-14 19:04:22 +01:00
FloatingGhost
b98bd66a94 Revert "update adminfe" 
This reverts commit 4532f75da3.
 2022-06-14 19:00:24 +01:00
FloatingGhost
4532f75da3 update adminfe 2022-06-14 18:51:33 +01:00
FloatingGhost
6ac2822c73 update fe 2022-06-14 17:29:41 +01:00
FloatingGhost
1f1c7363df update pleroma-fe 2022-06-14 17:10:31 +01:00
FloatingGhost
c7328c438f update pleromaFE 2022-06-14 16:35:32 +01:00
sn0w
60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
FloatingGhost
a43859c8f4 update pleroma-fe 2022-06-12 14:00:52 +01:00
FloatingGhost
40242e185c update pleroma-fe 2022-06-11 17:15:57 +01:00
FloatingGhost
f225db8596 update pleroma-fe 2022-06-08 15:16:32 +01:00
FloatingGhost
e3214cdfe3 Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:48:10 +00:00
FloatingGhost
d884087e7c re-add mastofe_settings column 2022-01-08 21:47:52 +00:00
FloatingGhost
0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
FloatingGhost
12a171844b Merge remote-tracking branch 'upstream/develop' into develop 2021-12-30 18:05:22 +00:00
Ivan Tashkinov
a7bdefc208 mix format 2021-12-29 11:44:33 +03:00
Ivan Tashkinov
0c7fb520bf Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_). 2021-12-29 11:41:21 +03:00
Alex Gleason
fa35e24a5e
Apps: add user_id index 2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint 2021-12-27 18:01:25 -06:00
marcin mikołajczak
de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason
73609211a4 Merge branch 'account-notes' into 'develop' 
MastoAPI: Add user notes on accounts

See merge request pleroma/pleroma!3540
 2021-12-25 01:41:12 +00:00
Alex Gleason
1ff9ffed83 Merge branch 'live-dashboard' into 'develop' 
Add Phoenix LiveDashboard

See merge request pleroma/pleroma!3566
 2021-12-19 17:35:14 +00:00
Alex Gleason
bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard 
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
 2021-12-15 19:05:27 -05:00
FloatingGhost
a85bf5929b add hashtag indexing 2021-12-14 13:55:14 +00:00
FloatingGhost
6ca70833f5 add user import 2021-12-14 13:55:14 +00:00
FloatingGhost
0b5206015b add mappings 2021-12-14 13:55:14 +00:00
sadposter
6f86baf491 update adminfe 2021-12-06 10:17:54 +00:00
sadposter
c85b278f1e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-12-05 15:01:23 +00:00
NEETzsche
182c563ed0 Force pinned_objects to be empty, not null 2021-11-29 18:08:09 +00:00
Alex Gleason
da06e1a17f
v2 Suggestions: add index on is_suggested column 2021-11-26 15:32:01 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response 2021-11-26 14:34:10 -06:00
marcin mikołajczak
8e040e098b Lint 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-21 18:17:06 +01:00
marcin mikołajczak
40414bf177 MastoAPI: Add user notes on accounts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-21 16:56:26 +01:00
sadposter
eb1c7d75f4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-10-16 14:08:04 +01:00
Ryo Ueno
5f2aefee1b Translated using Weblate (Japanese) 
Currently translated at 21.6% (23 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
 2021-10-06 06:12:17 +00:00
Ryo Ueno
84a7eb5597 Added translation using Weblate (Japanese) 2021-10-06 06:12:17 +00:00
Hồ Nhất Duy
a84aa10f70 Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
 2021-10-06 06:12:17 +00:00
Hồ Nhất Duy
3647c8e45b Added translation using Weblate (Vietnamese) 2021-10-06 06:12:17 +00:00
@liimee
a3909f30b6 Translated using Weblate (Indonesian) 
Currently translated at 64.1% (68 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
f0d0d4f6e4 Translated using Weblate (Indonesian) 
Currently translated at 61.3% (65 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
f2806adeed Translated using Weblate (Indonesian) 
Currently translated at 59.4% (63 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
4a15fd8a0a Translated using Weblate (Indonesian) 
Currently translated at 55.6% (59 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
bea8a204a9 Translated using Weblate (Indonesian) 
Currently translated at 50.9% (54 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
e00fe5b616 Translated using Weblate (Indonesian) 
Currently translated at 4.7% (5 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
 2021-10-06 06:12:17 +00:00
@liimee
477d839444 Added translation using Weblate (Indonesian) 2021-10-06 06:12:17 +00:00
marcin mikołajczak
8467065aba Translated using Weblate (Polish) 
Currently translated at 100.0% (104 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
 2021-10-06 06:12:17 +00:00
Haelwenn (lanodan) Monnier
a17910a6c6
CI: Bump lint stage to elixir-1.12 
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
 2021-10-06 08:11:05 +02:00
sadposter
bd9c9136f9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-09-13 16:14:58 +01:00
Haelwenn
6b3842cf50 Merge branch 'remove/mastofe' into 'develop' 
Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392
 2021-09-07 16:41:53 +00:00
sadposter
b202cf15d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-08-30 22:04:42 +01:00
Sean King
6519732045
GET /api/v1/apps endpoint 2021-08-25 21:01:04 -06:00
marcin mikołajczak
edd2a38e53 Translated using Weblate (Polish) 
Currently translated at 98.0% (102 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
 2021-08-13 15:42:21 +00:00
marcin mikołajczak
7a9113deb1 Translated using Weblate (Polish) 
Currently translated at 75.0% (78 of 104 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
 2021-08-13 15:42:21 +00:00
Haelwenn
901204df22 Merge branch 'poll-notification' into 'develop' 
MastodonAPI: Support poll notification

See merge request pleroma/pleroma!3484
 2021-08-09 10:02:37 +00:00
Haelwenn
6384d78035 Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop' 
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma!3314
 2021-08-09 09:37:59 +00:00
Haelwenn (lanodan) Monnier
0910777d41
Update PleromaFE Bundle (2.4.0) 
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
 2021-08-08 15:21:21 +02:00
Ilja
1f52246a02
Add database migrations 
* SimplePolicy
* quarentine
* transparency_exclusions
 2021-08-06 07:59:53 +02:00
Haelwenn (lanodan) Monnier
5f8a9b671f
Update AdminFE bundle 2021-08-01 08:26:39 +02:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes 2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification 2021-07-17 22:19:38 -05:00
Sean King
5d279a22b1 Merge develop branch upstream 2021-07-10 11:04:16 -06:00