summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-28Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'Haelwenn
Extract translatable strings See merge request pleroma/pleroma!3712
2022-07-26Extract translatable stringsTusooa Zhu
2022-07-26Merge branch 'authorized-fetch' into 'develop'tusooa
Add authorized_fetch_mode to description.exs See merge request pleroma/pleroma!3710
2022-07-25Add authorized_fetch_mode to description.exsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-24Merge branch 'fix/emoji-react-qualification' into 'develop'tusooa
EmojiReactValidator: fix emoji qualification See merge request pleroma/pleroma!3708
2022-07-24EmojiReactValidator: fix emoji qualificationHélène
Tries fully-qualifying emoji when receiving them, by adding the emoji variation sequence to the received reaction emoji. This issue arises when other instance software, such as Misskey, tries reacting with emoji that have unqualified or minimally qualified variants, like a red heart. Pleroma only accepts fully qualified emoji in emoji reactions, and refused those emoji. Now, Pleroma will attempt to properly qualify them first, and reject them if checks still fail. This commit contains changes to tests proposed by lanodan. Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>
2022-07-23Merge branch 'mute-expiration' into 'develop'tusooa
MastoAPI: Show mutes expiration date See merge request pleroma/pleroma!3682
2022-07-22Merge branch 'revert-454f892f' into 'develop'Haelwenn
Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" See merge request pleroma/pleroma!3707
2022-07-22Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"Haelwenn
This reverts merge request !3684
2022-07-22Merge branch 'weblate' into 'develop'Haelwenn
Translations update from Pleroma Weblate See merge request pleroma/pleroma!3705
2022-07-22Translated using Weblate (French)Haelwenn
Currently translated at 100.0% (34 of 34 strings) Translation: Pleroma/Pleroma Backend (domain default) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
2022-07-22Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 13.0% (130 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 13.0% (130 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 99.0% (102 of 103 strings) Translation: Pleroma/Pleroma Backend (domain errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 88.2% (30 of 34 strings) Translation: Pleroma/Pleroma Backend (domain default) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 82.9% (39 of 47 strings) Translation: Pleroma/Pleroma Backend (domain posix_errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 82.9% (39 of 47 strings) Translation: Pleroma/Pleroma Backend (domain posix_errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 11.8% (118 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 11.8% (118 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 88.2% (30 of 34 strings) Translation: Pleroma/Pleroma Backend (domain default) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 99.0% (102 of 103 strings) Translation: Pleroma/Pleroma Backend (domain errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/zh_Hans/
2022-07-22Translated using Weblate (French)Haelwenn
Currently translated at 100.0% (47 of 47 strings) Translation: Pleroma/Pleroma Backend (domain posix_errors) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/fr/
2022-07-22Translated using Weblate (French)Haelwenn
Currently translated at 100.0% (34 of 34 strings) Translation: Pleroma/Pleroma Backend (domain default) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 3.3% (33 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 100.0% (83 of 83 strings) Translation: Pleroma/Pleroma Backend (domain static_pages) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/zh_Hans/
2022-07-22Added translation using Weblate (French)Haelwenn
2022-07-22Added translation using Weblate (French)Haelwenn
2022-07-22Translated using Weblate (French)Haelwenn
Currently translated at 32.3% (11 of 34 strings) Translation: Pleroma/Pleroma Backend (domain default) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-default/fr/
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 1.6% (16 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Translated using Weblate (French)Haelwenn
Currently translated at 100.0% (83 of 83 strings) Translation: Pleroma/Pleroma Backend (domain static_pages) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/fr/
2022-07-22Added translation using Weblate (French)Haelwenn
2022-07-22Added translation using Weblate (French)Haelwenn
2022-07-22Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 0.5% (5 of 998 strings) Translation: Pleroma/Pleroma Backend (domain config_descriptions) Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-22Added translation using Weblate (Chinese (Simplified))tusooa
2022-07-22Merge branch 'fix-owncast' into 'develop'Haelwenn
Fix owncast See merge request pleroma/pleroma!3706
2022-07-22AttachmentValidator: fix_media_type/1 fallback to application/octet-streamHaelwenn (lanodan) Monnier
2022-07-22Add test for broken owncast federationFloatingGhost
2022-07-22ArticleNotePageValidator: Fix when attachments are a Map (ie. owncast)Haelwenn (lanodan) Monnier
2022-07-21Merge branch 'birthday_fix' into 'develop'tusooa
Allow to unset birthday See merge request pleroma/pleroma!3702
2022-07-21Merge branch 'fix/emoji-react-qualification' into 'develop'Haelwenn
EmojiReactValidator: fix emoji qualification See merge request pleroma/pleroma!3684
2022-07-21Merge remote-tracking branch 'upstream/develop' into HEADTusooa Zhu
2022-07-20Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop'Haelwenn
Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900 Closes #2900 See merge request pleroma/pleroma!3701
2022-07-20Merge branch 'fix-cycles' into 'develop'Haelwenn
CI: Remove cache on cycles See merge request pleroma/pleroma!3704
2022-07-20CI: Remove cache on cyclesHaelwenn (lanodan) Monnier
cycles uses a different system than the rest of the testing_cache, creating errors like libcrypto.so.1 being missing
2022-07-18Actually fix with forward slashes being restricted inside nicknameSean King
2022-07-17Don't accept forward slash character for nicknamesSean King
2022-07-17Allow to unset birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17Merge branch 'shrink-ci' into 'develop'Haelwenn
Shrink CI See merge request pleroma/pleroma!3691
2022-07-17Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'Haelwenn
Translatable config descriptions Closes pleroma-meta#65 See merge request pleroma/pleroma!3695
2022-07-16Document way to do notice compatibility routes with Nginx reverse-proxy insteadSean King