AkkomaGang/akkoma
AkkomaGang/akkoma
15
64
Fork 88
Code Issues 174 Pull requests 20 Projects 2 Releases 14 Packages Wiki Activity
14314 commits 27 branches 107 tags 362 MiB
Commit graph

14314 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hélène
388bbc4978
EmojiReactValidator: fix emoji qualification 
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-24 13:36:06 +02:00
tusooa
301ce5bc62 Merge branch 'mute-expiration' into 'develop' 
MastoAPI: Show mutes expiration date

See merge request pleroma/pleroma!3682
 2022-07-23 00:34:15 +00:00
Haelwenn
21e587ff1a Merge branch 'revert-454f892f' into 'develop' 
Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"

See merge request pleroma/pleroma!3707
 2022-07-22 23:56:52 +00:00
Haelwenn
cfb21d011f Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" 
This reverts merge request !3684
 2022-07-22 23:19:49 +00:00
Haelwenn
e077da27fe Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3705
 2022-07-22 22:46:37 +00:00
Haelwenn
c057ec6878 Translated using Weblate (French) 
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-22 19:00:37 +00:00
Yating Zhan
4217ac4074 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
1b091c7950 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Yating Zhan
0ad115ddf0 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Yating Zhan
a543161ba9 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Yating Zhan
2fffca8ef3 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
13e41ab8ba Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
ca8341a96c Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Yating Zhan
5ca95a4f1a Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
aff4d5df1c Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
48bd45acec Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Haelwenn
0b2243f17e Translated using Weblate (French) 
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-22 19:00:37 +00:00
Haelwenn
9399fd4abd Translated using Weblate (French) 
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-22 19:00:37 +00:00
tusooa
54cf23f2f8 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
8b55661ae6 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Haelwenn
8c3684ee8c Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
bc488824f8 Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
77ebde450e Translated using Weblate (French) 
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-22 19:00:37 +00:00
tusooa
21bd168226 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
Haelwenn
6da0b50645 Translated using Weblate (French) 
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-22 19:00:37 +00:00
Haelwenn
37ea9e014a Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
Haelwenn
99ad602577 Added translation using Weblate (French) 2022-07-22 19:00:37 +00:00
tusooa
cc40640f54 Translated using Weblate (Chinese (Simplified)) 
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-22 19:00:37 +00:00
tusooa
ffe8459349 Added translation using Weblate (Chinese (Simplified)) 2022-07-22 19:00:37 +00:00
Haelwenn
3b2bac7a0f Merge branch 'fix-owncast' into 'develop' 
Fix owncast

See merge request pleroma/pleroma!3706
 2022-07-22 19:00:23 +00:00
Haelwenn (lanodan) Monnier
eba1666575 AttachmentValidator: fix_media_type/1 fallback to application/octet-stream 2022-07-22 20:30:45 +02:00
FloatingGhost
09e0304b9c Add test for broken owncast federation 2022-07-22 20:30:45 +02:00
Haelwenn (lanodan) Monnier
be98900904 ArticleNotePageValidator: Fix when attachments are a Map (ie. owncast) 2022-07-22 20:30:45 +02:00
tusooa
c589b8445f Merge branch 'birthday_fix' into 'develop' 
Allow to unset birthday

See merge request pleroma/pleroma!3702
 2022-07-21 21:27:16 +00:00
Haelwenn
454f892f37 Merge branch 'fix/emoji-react-qualification' into 'develop' 
EmojiReactValidator: fix emoji qualification

See merge request pleroma/pleroma!3684
 2022-07-21 17:45:47 +00:00
Tusooa Zhu
4350a205a4
Merge remote-tracking branch 'upstream/develop' into HEAD 2022-07-21 13:44:16 -04:00
Haelwenn
1f18ab36b5 Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop' 
Document way to do notice compatibility routes with Nginx reverse-proxy, fixes #2900

Closes #2900

See merge request pleroma/pleroma!3701
 2022-07-20 16:57:05 +00:00
Haelwenn
fff7571e0d Merge branch 'fix-cycles' into 'develop' 
CI: Remove cache on cycles

See merge request pleroma/pleroma!3704
 2022-07-20 16:52:15 +00:00
Haelwenn (lanodan) Monnier
65a5c713e9 CI: Remove cache on cycles 
cycles uses a different system than the rest of the testing_cache, creating errors like libcrypto.so.1 being missing
 2022-07-20 17:49:56 +02:00
Sean King
3da1b2548d
Actually fix with forward slashes being restricted inside nickname 2022-07-18 21:30:57 -06:00
Sean King
2c7eed122e
Don't accept forward slash character for nicknames 2022-07-17 12:50:01 -06:00
marcin mikołajczak
fb268c4378 Allow to unset birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-17 19:46:29 +02:00
Haelwenn
3193f18cf3 Merge branch 'shrink-ci' into 'develop' 
Shrink CI

See merge request pleroma/pleroma!3691
 2022-07-17 17:34:47 +00:00
Haelwenn
bb4860e222 Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop' 
Translatable config descriptions

Closes pleroma-meta#65

See merge request pleroma/pleroma!3695
 2022-07-17 17:34:21 +00:00
Sean King
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead 2022-07-16 23:44:37 -06:00
tusooa
8aba7c08d1 Merge branch 'notification_types' into 'develop' 
MastoAPI: Use `types` for filtering notifications

See merge request pleroma/pleroma!3648
 2022-07-17 03:17:43 +00:00
tusooa
eb4b7f6efa Merge branch 'docs__setting_up_a_gitlab_runner' into 'develop' 
DOCS: Add some small piece about setting up a Gitlab-runner

See merge request pleroma/pleroma!3694
 2022-07-17 02:36:28 +00:00
marcin mikołajczak
597f56b4c4 Use :utc_datetime 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-16 16:28:22 +02:00
Tusooa Zhu
1d7e8d6e01
Pass in msgctxt for config translation strings 2022-07-14 17:41:33 -04:00
tusooa
3fb9171694 Merge branch 'from/upstream-develop/tusooa/zh-translation' into 'develop' 
Translate static_pages.po (Simplified Chinese)

See merge request pleroma/pleroma!3655
 2022-07-13 23:39:46 +00:00