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
Tusooa Zhu
1edbda39e1
Make password reset pages translatable
2022-02-28 01:04:04 -05:00
HJ
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
Sean King
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
Haelwenn (lanodan) Monnier
56197192bb
mix: Check .git presence
2022-02-25 10:39:12 +01:00
Ilja
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
Tusooa Zhu
9f4c5743e8
Make lint happy
2022-02-21 19:12:32 -05:00
Tusooa Zhu
2fa1ca84e6
Extract translatable text
2022-02-21 18:44:36 -05:00
Tusooa Zhu
a867107437
Make remote follow pages translatable
2022-02-21 18:43:45 -05:00
Tusooa Zhu
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
lain
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
Alex Gleason
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
marcin mikołajczak
e473bcf7a0
Max media attachment count
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
Alex Gleason
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
Alex Gleason
7c044a1841
FilterControllerTest: tag erratic test
2022-02-02 13:10:39 -06:00
Haelwenn (lanodan) Monnier
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
Alex Gleason
71c80204c9
Merge branch 'roadhouse' into 'develop'
...
Roadhouse debugging
See merge request pleroma/pleroma!3628
2022-02-02 18:44:09 +00:00
Alex Gleason
bd81af731e
Tag erratic test
2022-02-02 12:29:53 -06:00
Alex Gleason
2d77976305
Add tests for mismatched context in replies
2022-02-02 12:19:35 -06:00
Alex Gleason
5a4e3aa715
Test that a Create/Note from Roadhouse validates
2022-02-02 11:02:23 -06:00
Alex Gleason
61dfeca1cc
Test that a Note from Roadhouse validates
2022-02-02 10:38:30 -06:00
Alex Gleason
de99fd7804
Merge branch 'birth-dates' into 'develop'
...
Birthdays: Fix outgoing federation of birth dates
See merge request pleroma/pleroma!3626
2022-02-01 15:21:34 +00:00
marcin mikołajczak
f8f2a17754
Birthdays: Fix outgoing federation of birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-01 12:00:26 +01:00
Alex Gleason
64944c164f
Merge branch 'mention-mrf-md' into 'develop'
...
ForceMentionsInContent: improve display of Markdown posts
See merge request pleroma/pleroma!3625
2022-01-28 16:53:40 +00:00
Alex Gleason
3bf257171f
ForceMentionsInContent: improve display of Markdown posts
2022-01-27 14:15:06 -06:00
Alex Gleason
a146f6acab
Merge branch 'mentions-mrf-replies-only' into 'develop'
...
ForceMentionsInContent: don't apply it to top-level posts
See merge request pleroma/pleroma!3624
2022-01-27 19:57:28 +00:00
Alex Gleason
27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts
2022-01-26 21:24:26 -06:00
Alex Gleason
2bab9dd175
Merge branch 'fix-bot-policy' into 'develop'
...
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(
See merge request pleroma/pleroma!3623
2022-01-26 23:25:58 +00:00
bot
a4de79ced0
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(
2022-01-26 22:53:02 +00:00
Alex Gleason
8951be7710
Merge branch 'inline-mention-self' into 'develop'
...
ForceMentionsInContent: don't mention self
See merge request pleroma/pleroma!3622
2022-01-25 21:49:33 +00:00
Alex Gleason
0604b0dd09
ForceMentionsInContent: don't mention self
2022-01-25 12:33:47 -06:00
Alex Gleason
0f4e0e667e
Merge branch 'recipients-inline' into 'develop'
...
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request pleroma/pleroma!3620
2022-01-25 17:43:39 +00:00
Alex Gleason
99e9c2c668
Merge branch 'birth-dates' into 'develop'
...
Fix show_birthday
See merge request pleroma/pleroma!3621
2022-01-25 16:59:07 +00:00
Alex Gleason
65b4d2ce84
ForceMentionsInContent: fix order of mentions
2022-01-25 10:42:34 -06:00
marcin mikołajczak
ab12a05a43
AccountView: Add test for show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:34:36 +01:00
marcin mikołajczak
c1ae35ff2c
Fix show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:04:41 +01:00
Alex Gleason
dd7977bb68
Merge branch 'birth-dates' into 'develop'
...
Birth dates
See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
marcin mikołajczak
249fe88d12
Birthdays: users_birthday_month_day_index
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 11:49:42 +01:00
Alex Gleason
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format
2022-01-24 20:03:43 -06:00
Alex Gleason
c5a20c80c4
ForceMentionsInContent: simplify finding users
2022-01-24 19:44:44 -06:00
Alex Gleason
d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag
2022-01-24 19:11:45 -06:00
Alex Gleason
1bbc701a3a
ForceMentionsInContent: use to instead of tag
2022-01-24 19:11:14 -06:00
Alex Gleason
19d557c870
Merge branch 'revert-6e27fc9c' into 'develop'
...
Revert "Merge branch 'log-slow-queries' into 'develop'"
See merge request pleroma/pleroma!3619
2022-01-24 19:06:33 +00:00
Alex Gleason
53de3a9d44
Revert "Merge branch 'log-slow-queries' into 'develop'"
...
This reverts merge request !3553
2022-01-24 18:54:43 +00:00
