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
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
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
cdc5bbe836
After code review
...
Use patern matching to see if someone was superuser before
2022-03-07 14:00:42 +01:00
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
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
79ccb6b999
Support fallbacking to other languages
2022-03-06 11:43:31 -05:00
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
cd42e2bed0
Lint
2022-03-03 09:49:55 -05:00
aca11fb70e
Support multiple locales from userLanguage cookie
2022-03-03 02:31:36 -05:00
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
d3f3f30c6a
Make lint happy
2022-03-02 22:56:19 -05:00
bc59da96c5
Add test for fallbacking to a general language
2022-03-02 20:04:30 -05:00
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
1a917cfeec
Add changelog
2022-03-02 09:51:46 -05:00
5e38887080
Document API addition
2022-03-02 09:47:51 -05:00
e644f8dea5
Allow user to register with custom language
2022-03-02 01:41:13 -05:00
396f036b13
Allow update_credentials to update User.language
2022-03-02 00:58:02 -05:00
0149ea4538
Send emails i18n'd using backend-stored user language
2022-03-01 22:19:13 -05:00
af82f09ce3
Make all emails translatable
2022-03-01 20:45:59 -05:00
8b0c2890f9
Fix digest test
2022-03-01 20:27:45 -05:00
1deab33fb0
Make mail and mailer translatable
2022-03-01 19:17:11 -05:00
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
fdbf9b06e5
Fix tests
2022-02-28 11:23:15 -05:00
cadca083ea
Make mfa pages translatable
2022-02-28 11:07:28 -05:00
50a316cd63
Make oauth pages translatable
2022-02-28 02:11:57 -05:00
f63d9b7835
Use proper lang attributes in htmls
2022-02-28 01:28:23 -05:00
0cc6557716
Make tag feed translatable
2022-02-28 01:13:39 -05:00
1edbda39e1
Make password reset pages translatable
2022-02-28 01:04:04 -05:00
ee05abe052
Merge branch 'revert/notice-routes' into 'develop'
...
Revert notice compatibility routes merge request
See merge request pleroma/pleroma!3576
2022-02-26 16:24:49 +00:00
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
56197192bb
mix: Check .git presence
2022-02-25 10:39:12 +01:00
6ba93c2cb3
Fix test get_user_apps/1
...
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.
When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827 ), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.
The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.
AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
2022-02-22 18:56:26 +01:00
9f4c5743e8
Make lint happy
2022-02-21 19:12:32 -05:00
2fa1ca84e6
Extract translatable text
2022-02-21 18:44:36 -05:00
a867107437
Make remote follow pages translatable
2022-02-21 18:43:45 -05:00
0fd3695b9c
Prefer userLanguage cookie over Accept-Language header in detecting locale
...
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-02-21 18:02:19 -05:00
d91e9cee04
Merge branch 'unicode-14.0-backend' into 'develop'
...
Unicode 14 Support
See merge request pleroma/pleroma!3633
2022-02-21 19:38:52 +00:00
061cb749cd
Add unicode 14 support
...
and add a test with a unicode 14 emoji
2022-02-21 12:28:33 -06:00
fa8e2ffa3f
Merge branch 'max_media_attachments' into 'develop'
...
Allow specifying max media attachment count
Closes #2665
See merge request pleroma/pleroma!3630
2022-02-06 18:25:14 +00:00
e473bcf7a0
Max media attachment count
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
60deddb7e5
Merge branch 'fix-tests-warn' into 'develop'
...
Fix tests matching on "warn"
See merge request pleroma/pleroma!3629
2022-02-02 19:57:03 +00:00
7c044a1841
FilterControllerTest: tag erratic test
2022-02-02 13:10:39 -06:00
d1cc9e4eaf
Fix tests matching on "warn"
...
Moving it to "warning" would break tests on 1.12.x
2022-02-02 12:45:26 -06:00
71c80204c9
Merge branch 'roadhouse' into 'develop'
...
Roadhouse debugging
See merge request pleroma/pleroma!3628
2022-02-02 18:44:09 +00:00
bd81af731e
Tag erratic test
2022-02-02 12:29:53 -06:00
2d77976305
Add tests for mismatched context in replies
2022-02-02 12:19:35 -06:00
Haelwenn