b4575815ed
Add entry to @context, tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 10:45:43 +02:00
3d7d1870b5
Expose nonAnonymous field from Smithereen polls
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-07 23:56:52 +02:00
marcin mikołajczak
3b964ee555
Merge branch 'merge-pleroma' into 'develop'
...
merge-pleroma
See merge request soapbox-pub/soapbox-be!145
2022-08-03 22:04:39 +00:00
55c62d19a8
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-03 23:42:48 +02:00
Alex Gleason
af622eaf03
Merge branch 'docker' into 'develop'
...
Fix the Dockerfile
See merge request soapbox-pub/soapbox-be!143
2022-08-02 20:55:09 +00:00
marcin mikołajczak
fdea5d2df6
Merge branch 'stream_markers' into 'develop'
...
Stream marker updates
See merge request soapbox-pub/soapbox-be!144
2022-08-02 07:35:37 +00:00
Haelwenn
b2ba307f4d
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
...
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
2022-08-02 05:39:50 +00:00
Haelwenn
7299795eb4
Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'
...
Allow users to create backups without providing email address
See merge request pleroma/pleroma!3665
2022-08-02 05:23:49 +00:00
Haelwenn
f8540b0a9d
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3716
2022-08-02 05:10:51 +00:00
fe0c02f2c8
Stream marker updates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-01 19:07:17 +02:00
Yating Zhan
99d4823ab1
Translated using Weblate (Chinese (Simplified))
...
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-31 22:00:56 +00:00
tusooa
cc533e6956
Translated using Weblate (Chinese (Simplified))
...
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-31 22:00:56 +00:00
Haelwenn
7de21ec991
Merge branch 'from/develop/tusooa/emit-move' into 'develop'
...
Implement moving account
See merge request pleroma/pleroma!3524
2022-07-31 22:00:40 +00:00
Haelwenn
5ef2dc317d
Change test case wording
2022-07-31 21:34:23 +00:00
tusooa
c80096522c
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
...
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
Haelwenn
b5266097a1
Merge branch 'mutes' into 'develop'
...
MastoAPI: Use `duration` param for mute expiration duration
See merge request pleroma/pleroma!3715
2022-07-31 19:41:25 +00:00
5d3d6a58f7
Use duration
param for mute expiration duration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-31 17:22:34 +02:00
Haelwenn
0814d0e0cb
Merge branch 'fix/proper-emoji-qualification' into 'develop'
...
Emoji: implement full-qualifier using combinations
See merge request pleroma/pleroma!3709
2022-07-28 04:46:15 +00:00
Haelwenn
0f9f3d2897
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
...
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
2022-07-28 04:37:10 +00:00
Haelwenn
18d6a58c7e
Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3712
2022-07-28 04:33:17 +00:00
Alex Gleason
288d1bf1b8
Docker: update maintainer data
2022-07-26 20:00:06 -05:00
Alex Gleason
246f0df88e
Fix the Dockerfile
2022-07-26 19:58:42 -05:00
Hélène
7167de592e
Emoji: apply recommended tail call changes
...
Behavior matches previous code.
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
2022-07-27 02:08:46 +02:00
marcin mikołajczak
5a3949edce
Merge branch 'webhooks' into 'develop'
...
Mastodon-like webhooks
See merge request soapbox-pub/soapbox-be!135
2022-07-26 18:49:08 +00:00
cca794e5fe
Merge remote-tracking branch 'soapbox/develop' into webhooks
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 19:12:52 +02:00
Tusooa Zhu
4bdd8e349c
Extract translatable strings
2022-07-26 10:50:29 -04:00
tusooa
36d79468ec
Merge branch 'authorized-fetch' into 'develop'
...
Add authorized_fetch_mode to description.exs
See merge request pleroma/pleroma!3710
2022-07-26 14:48:00 +00:00
marcin mikołajczak
47fc009882
Merge branch 'merge-pleroma' into 'develop'
...
Merge Pleroma
See merge request soapbox-pub/soapbox-be!142
2022-07-26 11:07:20 +00:00
965f1de57e
Revert "Document way to do notice compatibility routes with Nginx reverse-proxy instead"
...
This reverts commit 64e16e6a4b
.
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 07:12:23 +02:00
Hélène
b99f5d6183
Emoji: split qualification variation into a module
2022-07-26 02:04:12 +02:00
a8540c3797
Merge Pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 23:51:14 +02:00
5153eba3a8
Add authorized_fetch_mode to description.exs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 19:53:51 +02:00
Hélène
fb3f6e1975
EmojiReactValidator: use new qualification method
2022-07-25 16:49:23 +02:00
Hélène
01d396585e
Emoji: implement full-qualifier using combinations
...
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-25 16:20:12 +02:00
tusooa
d39f803bdd
Merge branch 'fix/emoji-react-qualification' into 'develop'
...
EmojiReactValidator: fix emoji qualification
See merge request pleroma/pleroma!3708
2022-07-24 21:36:43 +00:00
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
Alex Gleason
6ecb09d0fb
Merge branch 'erlang-24.3' into 'develop'
...
asdf: upgrade erlang to 24.3.4.2
See merge request soapbox-pub/soapbox-be!141
2022-07-22 23:01:26 +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