aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-01Revert "Merge branch 'revert/notice-routes' into 'develop'"feld
This reverts merge request !3576
2022-02-28Fix testsTusooa Zhu
2022-02-28Make mfa pages translatableTusooa Zhu
2022-02-28Make oauth pages translatableTusooa Zhu
2022-02-28Use proper lang attributes in htmlsTusooa Zhu
2022-02-28Make tag feed translatableTusooa Zhu
2022-02-28Make password reset pages translatableTusooa Zhu
2022-02-26Merge branch 'revert/notice-routes' into 'develop'HJ
Revert notice compatibility routes merge request See merge request pleroma/pleroma!3576
2022-02-25Copyright bump for 2022Sean King
2022-02-25mix: Check .git presenceHaelwenn (lanodan) Monnier
2022-02-22Fix test get_user_apps/1Ilja
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 cb2a072e6252b7c3f6473f7cfd1af5c0ec732d7b
2022-02-21Make lint happyTusooa Zhu
2022-02-21Extract translatable textTusooa Zhu
2022-02-21Make remote follow pages translatableTusooa Zhu
2022-02-21Prefer userLanguage cookie over Accept-Language header in detecting localeTusooa Zhu
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-02-21Merge branch 'unicode-14.0-backend' into 'develop'lain
Unicode 14 Support See merge request pleroma/pleroma!3633
2022-02-21Add unicode 14 supportSam Therapy
and add a test with a unicode 14 emoji
2022-02-06Merge branch 'max_media_attachments' into 'develop'Alex Gleason
Allow specifying max media attachment count Closes #2665 See merge request pleroma/pleroma!3630
2022-02-06Max media attachment countmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-02Merge branch 'fix-tests-warn' into 'develop'Alex Gleason
Fix tests matching on "warn" See merge request pleroma/pleroma!3629
2022-02-02FilterControllerTest: tag erratic testAlex Gleason
2022-02-02Fix tests matching on "warn"Haelwenn (lanodan) Monnier
Moving it to "warning" would break tests on 1.12.x
2022-02-02Merge branch 'roadhouse' into 'develop'Alex Gleason
Roadhouse debugging See merge request pleroma/pleroma!3628
2022-02-02Tag erratic testAlex Gleason
2022-02-02Add tests for mismatched context in repliesAlex Gleason
2022-02-02Test that a Create/Note from Roadhouse validatesAlex Gleason
2022-02-02Test that a Note from Roadhouse validatesAlex Gleason
2022-02-01Merge branch 'birth-dates' into 'develop'Alex Gleason
Birthdays: Fix outgoing federation of birth dates See merge request pleroma/pleroma!3626
2022-02-01Birthdays: Fix outgoing federation of birth datesmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-28Merge branch 'mention-mrf-md' into 'develop'Alex Gleason
ForceMentionsInContent: improve display of Markdown posts See merge request pleroma/pleroma!3625
2022-01-27ForceMentionsInContent: improve display of Markdown postsAlex Gleason
2022-01-27Merge branch 'mentions-mrf-replies-only' into 'develop'Alex Gleason
ForceMentionsInContent: don't apply it to top-level posts See merge request pleroma/pleroma!3624
2022-01-26ForceMentionsInContent: don't apply it to top-level postsAlex Gleason
2022-01-26Merge branch 'fix-bot-policy' into 'develop'Alex Gleason
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:( See merge request pleroma/pleroma!3623
2022-01-26ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(bot
2022-01-25Merge branch 'inline-mention-self' into 'develop'Alex Gleason
ForceMentionsInContent: don't mention self See merge request pleroma/pleroma!3622
2022-01-25ForceMentionsInContent: don't mention selfAlex Gleason
2022-01-25Merge branch 'recipients-inline' into 'develop'Alex Gleason
ForceMentionsInContent: wrap mentions in a span, fix the formatting See merge request pleroma/pleroma!3620
2022-01-25Merge branch 'birth-dates' into 'develop'Alex Gleason
Fix show_birthday See merge request pleroma/pleroma!3621
2022-01-25ForceMentionsInContent: fix order of mentionsAlex Gleason
2022-01-25AccountView: Add test for show_birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25Fix show_birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25Merge branch 'birth-dates' into 'develop'Alex Gleason
Birth dates See merge request pleroma/pleroma!3608
2022-01-25Birthdays: users_birthday_month_day_indexmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-24ForceMentionsInContentTest: return mentions in a not terrible formatAlex Gleason
2022-01-24ForceMentionsInContent: simplify finding usersAlex Gleason
2022-01-24ForceMentionsInContent: wrap inline mentions with span tagAlex Gleason
2022-01-24ForceMentionsInContent: use `to` instead of `tag`Alex Gleason
2022-01-24Merge branch 'revert-6e27fc9c' into 'develop'Alex Gleason
Revert "Merge branch 'log-slow-queries' into 'develop'" See merge request pleroma/pleroma!3619
2022-01-24Revert "Merge branch 'log-slow-queries' into 'develop'"Alex Gleason
This reverts merge request !3553
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 19:16:37 +0000