summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-25mix: Check .git presencebugfix/mix-dotgitHaelwenn (lanodan) Monnier
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 testfix-tests-warnAlex 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
2022-01-23Merge branch 'preserve-mentions-order' into 'develop'Alex Gleason
Preserve order of mentioned users See merge request pleroma/pleroma!3617
2022-01-23Add a testmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23Preserve order of mentioned usersmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23Create index for `show_birthday`marcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23Birthdays: Fix tests, add test for misskeymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23Birthdays: hide_birthday -> show_birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-22Merge remote-tracking branch 'origin/develop' into birth-datesAlex Gleason
2022-01-22Merge branch 'less_erratic_expiration_test' into 'develop'Alex Gleason
Make test less erratic by adding five second tolerance See merge request pleroma/pleroma!3614
2022-01-22Update description.exsbirth-datesAlex Gleason
2022-01-22Birthdays: birth_date --> birthdayAlex Gleason
2022-01-22Make test less erratic by adding five second toleranceNEETzsche
2022-01-22Merge branch 'apple_autofill_suggestions' into 'develop'Alex Gleason
Add autocompelete values suggested by Apple See merge request pleroma/pleroma!3612
2022-01-22Merge branch 'erratic-filter-test' into 'develop'Alex Gleason
FilterTest: tag erratic test See merge request pleroma/pleroma!3613
2022-01-22FilterTest: tag erratic testAlex Gleason