Tusooa Zhu
5e8aac0e07
Record edit history for Note and Question Updates
2022-05-29 13:54:16 -04:00
Tusooa Zhu
0f6a5eb9a2
Handle Note and Question Updates
2022-05-29 12:54:57 -04:00
Tusooa Zhu
547def67a7
Allow Updates by every actor on the same origin
2022-05-29 11:36:00 -04:00
Haelwenn
7466136ad3
Merge branch 'lewdthewides-develop-patch-48691' into 'develop'
...
Instruct users to run 'git pull' as the pleroma user
See merge request pleroma/pleroma!3667
2022-05-22 17:09:54 +00:00
lain
bdca5f5d68
Merge branch 'fix/mrf-steal-emoji-regex' into 'develop'
...
StealEmojiPolicy: fix String rejected_shortcodes
See merge request pleroma/pleroma!3673
2022-05-19 08:55:39 +00:00
a74ce2d77a
StealEmojiPolicy: fix String rejected_shortcodes
...
* rejected_shortcodes is defined as a list of strings in the
configuration description. As such, database-based configuration was
led to handle those settings as strings, and not as the actually
expected type, Regex.
* This caused each message passing through this MRF, if a rejected
shortcode was set and the emoji did not exist already on the instance,
to fail federating, as an exception was raised, swiftly caught and
mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
now handled as perfect matches for an emoji shortcode (meaning that if
the emoji-to-be-pulled's shortcode is in the blacklist, it will be
rejected), while still supporting Regex types as before.
2022-05-18 21:25:10 +02:00
lewdthewides
7977dd6ac7
Instruct users to run 'git pull' as the pleroma user
2022-05-12 16:02:58 +00:00
Haelwenn
4605efe272
Merge branch 'improve_anti_followbot_policy' into 'develop'
...
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
Closes #2561
See merge request pleroma/pleroma!3498
2022-05-08 18:10:40 +00:00
Ilja
a8093732bd
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
2022-05-08 18:10:40 +00:00
Haelwenn
214ef7ff73
Merge branch 'security/2.4.3-develop' into 'develop'
...
Merge back 2.4.3
See merge request pleroma/pleroma!3663
2022-05-06 08:27:03 +00:00
Haelwenn (lanodan) Monnier
f9943b2065
mix: Bump to 2.4.52 for 2.4.3 mergeback
2022-05-06 10:23:43 +02:00
Tusooa Zhu
57c030a0a7
Skip cache when /objects or /activities is authenticated
...
Ref: fix-local-public
2022-05-06 10:23:26 +02:00
Tusooa Zhu
e2d24eda57
Allow to skip cache in Cache plug
...
Ref: fix-local-public
2022-05-06 10:23:26 +02:00
Ilja
c3b2b71ea2
update sweet_xml [Security]
2022-05-06 10:23:25 +02:00
Haelwenn
8517bc18aa
Merge branch 'from/upstream-develop/tusooa/fix-en-fallback' into 'develop'
...
Fix incorrect fallback when English is set to first language
See merge request pleroma/pleroma!3656
2022-04-18 03:31:44 +00:00
Tusooa Zhu
be08d9305b
Fix incorrect fallback when English is set to first language
2022-04-17 22:39:52 -04:00
Haelwenn
a5d7e98de0
Merge branch 'fix_eratic_test_for_report_notes' into 'develop'
...
Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
See merge request pleroma/pleroma!3653
2022-04-05 12:11:53 +00:00
Ilja
5f37db330f
Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
...
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote.
I made the test on the content more generic
2022-04-05 13:21:09 +02:00
Haelwenn
d7c53da77a
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
...
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
Haelwenn
e63d49d238
Merge branch 'caddyfile-v2' into 'develop'
...
Update Caddyfile to Caddy v2
Closes #2764
See merge request pleroma/pleroma!3641
2022-03-20 18:14:00 +00:00
Haelwenn
b76340511d
Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop'
...
Delete report notifs when demoting from superuser
Closes #2840
See merge request pleroma/pleroma!3642
2022-03-20 18:13:19 +00:00
Haelwenn
2db640632b
Merge branch 'bugfix/mix-dotgit' into 'develop'
...
mix: Check `.git` presence
See merge request pleroma/pleroma!3638
2022-03-17 21:21:59 +00:00
Ilja
cdc5bbe836
After code review
...
Use patern matching to see if someone was superuser before
2022-03-07 14:00:42 +01:00
Haelwenn
4458db3201
Merge branch 'fix_test_get_user_apps' into 'develop'
...
Fix test get_user_apps/1
See merge request pleroma/pleroma!3636
2022-03-06 18:40:49 +00:00
Haelwenn
ee32e36b01
Merge branch 'copyright-bump-2022' into 'develop'
...
Copyright bump for 2022
See merge request pleroma/pleroma!3593
2022-03-06 18:29:37 +00:00
Tusooa Zhu
79ccb6b999
Support fallbacking to other languages
2022-03-06 11:43:31 -05:00
Ilja
89667189b8
Delete report notifs when demoting from superuser
...
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-03-06 17:36:30 +01:00
9b69ccb35b
Update Caddyfile to Caddy v2
2022-03-06 14:24:32 +01:00
Tusooa Zhu
cd42e2bed0
Lint
2022-03-03 09:49:55 -05:00
Tusooa Zhu
aca11fb70e
Support multiple locales from userLanguage cookie
2022-03-03 02:31:36 -05:00
Tusooa Zhu
7ea330b4fe
Support multiple locales formally
...
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.
[0]: https://github.com/elixir-gettext/gettext/issues/303
2022-03-03 02:03:44 -05:00
Tusooa Zhu
d3f3f30c6a
Make lint happy
2022-03-02 22:56:19 -05:00
Tusooa Zhu
bc59da96c5
Add test for fallbacking to a general language
2022-03-02 20:04:30 -05:00
Tusooa Zhu
8de573b047
Fallback to a variant if the language in general is not supported
...
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.
Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
2022-03-02 19:59:11 -05:00
Tusooa Zhu
1a917cfeec
Add changelog
2022-03-02 09:51:46 -05:00
Tusooa Zhu
5e38887080
Document API addition
2022-03-02 09:47:51 -05:00
Tusooa Zhu
e644f8dea5
Allow user to register with custom language
2022-03-02 01:41:13 -05:00
Tusooa Zhu
396f036b13
Allow update_credentials to update User.language
2022-03-02 00:58:02 -05:00
Tusooa Zhu
0149ea4538
Send emails i18n'd using backend-stored user language
2022-03-01 22:19:13 -05:00
Tusooa Zhu
af82f09ce3
Make all emails translatable
2022-03-01 20:45:59 -05:00
Tusooa Zhu
8b0c2890f9
Fix digest test
2022-03-01 20:27:45 -05:00
Tusooa Zhu
1deab33fb0
Make mail and mailer translatable
2022-03-01 19:17:11 -05:00
Tusooa Zhu
32e4aa42d3
Make static fe translatable
2022-03-01 18:48:08 -05:00
0b686c6e54
Merge branch 'revert-ee05abe0' into 'develop'
...
Revert "Merge branch 'revert/notice-routes' into 'develop'"
See merge request pleroma/pleroma!3639
2022-03-01 19:02:48 +00:00
9c52a496f7
Revert "Merge branch 'revert/notice-routes' into 'develop'"
...
This reverts merge request !3576
2022-03-01 19:02:28 +00:00
Tusooa Zhu
fdbf9b06e5
Fix tests
2022-02-28 11:23:15 -05:00
Tusooa Zhu
cadca083ea
Make mfa pages translatable
2022-02-28 11:07:28 -05:00
Tusooa Zhu
50a316cd63
Make oauth pages translatable
2022-02-28 02:11:57 -05:00
Tusooa Zhu
f63d9b7835
Use proper lang attributes in htmls
2022-02-28 01:28:23 -05:00
Tusooa Zhu
0cc6557716
Make tag feed translatable
2022-02-28 01:13:39 -05:00
