summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-24Merge branch 'add/glitch-lily-fe' into 'develop'tusooa
Add glitch-lily as an installable frontend See merge request pleroma/pleroma!3727
2022-08-21Merge branch 'from/upstream-develop/tusooa/alpine-bump' into 'develop'tusooa
Use latest alpine version for docker image See merge request pleroma/pleroma!3719
2022-08-19Add glitch-lily as an installable frontendSean King
2022-08-19Merge branch 'varnish-fix-changelog' into 'develop'feld
Document the changes for Varnish 7.0+ compatibility and RFC compliance See merge request pleroma/pleroma!3723
2022-08-12Document the changes for Varnish 7.0+ compatibility and RFC complianceMark Felder
2022-08-12Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into ↵Haelwenn
'develop' Treat MRF rejects as success in Oban worker Closes #2912 See merge request pleroma/pleroma!3720
2022-08-12Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into ↵Haelwenn
'develop' Fix flaky tests with DB connections; Allow higher amount of restarts for Pleroma.Repo during testing See merge request pleroma/pleroma!3696
2022-08-12Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'Haelwenn
Synchronized settings for apps (frontends) See merge request pleroma/pleroma!3698
2022-08-12Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'Haelwenn
Backport: bugfix/follow-state Closes #2902 See merge request pleroma/pleroma!3718
2022-08-11Merge branch 'fix-varnish7-support' into 'develop'feld
Fix Varnish7 support See merge request pleroma/pleroma!3722
2022-08-10Fix the mocks to use uppercase as wellMark Felder
2022-08-10Update the recommended VCL configurationMark Felder
2022-08-10Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a ↵Mark Felder
capitalized HEAD verb
2022-08-08Treat containment failure as cancel in ReceiverWorkerTusooa Zhu
2022-08-06Fix FederatorTestTusooa Zhu
2022-08-06Treat MRF rejects as success in Oban workerTusooa Zhu
2022-08-05Use latest alpine version for docker imageTusooa Zhu
2022-08-03bugfix/follow-state (#104)floatingghost
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
2022-08-02Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'Haelwenn
local only fixes Closes #2871 See merge request pleroma/pleroma!3660
2022-08-02Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'Haelwenn
Allow users to create backups without providing email address See merge request pleroma/pleroma!3665
2022-08-02Merge branch 'weblate' into 'develop'Haelwenn
Translations update from Pleroma Weblate See merge request pleroma/pleroma!3716
2022-07-31Translated using Weblate (Chinese (Simplified))Yating Zhan
Currently translated at 18.9% (189 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-31Translated using Weblate (Chinese (Simplified))tusooa
Currently translated at 18.9% (189 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-31Merge branch 'from/develop/tusooa/emit-move' into 'develop'Haelwenn
Implement moving account See merge request pleroma/pleroma!3524
2022-07-31Change test case wordingHaelwenn
2022-07-31Merge branch 'develop' into 'from/develop/tusooa/emit-move'tusooa
# Conflicts: # CHANGELOG.md # test/pleroma/user_test.exs
2022-07-31Merge branch 'mutes' into 'develop'Haelwenn
MastoAPI: Use `duration` param for mute expiration duration See merge request pleroma/pleroma!3715
2022-07-31Use `duration` param for mute expiration durationmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-28Merge branch 'fix/proper-emoji-qualification' into 'develop'Haelwenn
Emoji: implement full-qualifier using combinations See merge request pleroma/pleroma!3709
2022-07-28Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'Haelwenn
Make mutes and blocks behave the same as other lists Closes #2384 See merge request pleroma/pleroma!3693
2022-07-28Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'Haelwenn
Extract translatable strings See merge request pleroma/pleroma!3712
2022-07-27Emoji: apply recommended tail call changesHélène
Behavior matches previous code. Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
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-26Emoji: split qualification variation into a moduleHélène
2022-07-25Add authorized_fetch_mode to description.exsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25EmojiReactValidator: use new qualification methodHélène
2022-07-25Emoji: implement full-qualifier using combinationsHélène
This implements fully_qualify_emoji/1, which will return the fully-qualified version of an emoji if it knows of one, or return the emoji unmodified if not. This code generates combinations per emoji: for each FE0F, all possible combinations of the character being removed or staying will be generated. This is made as an attempt to find all partially-qualified and unqualified versions of a fully-qualified emoji. I have found *no cases* for which this would be a problem, after browsing the entire emoji list in emoji-test.txt. This is safe, and, sadly, most likely the sanest too.
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/
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 17:47:19 +0000