summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-17tests fixesfeature/1392-support-irreversible-filtersAlexander Strizhakov
2020-06-17adding benchmarks in new formatAlexander Strizhakov
2020-06-17test fixAlexander Strizhakov
2020-06-17renaming back and reject nil on createAlexander Strizhakov
2020-06-17Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-06-17Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-06-17Apply suggestion to lib/pleroma/filter.exAlexander Strizhakov
2020-06-17don't filter notifications for follow and move typesAlexander Strizhakov
2020-06-17Restrict thread statuses that contain user's irreversible filtersSergey Suprunenko
2020-06-17Skip notifications for statuses that contain an irreversible filtered wordSergey Suprunenko
2020-06-17Restrict statuses that contain user's irreversible filtersSergey Suprunenko
2020-06-17Merge branch 'release/update-otp-elixir' into 'develop'rinpatch
2020-06-17CHANGELOG.md: mention minimal elixir version updaterinpatch
2020-06-17Update OTP releases to official images of 1.10.3rinpatch
2020-06-16Merge branch 'hotfix/notification-migration' into 'develop'lain
2020-06-16Chunk the notification type backfill migrationrinpatch
2020-06-16Merge branch '1866-last-status-stuff' into 'develop'Haelwenn
2020-06-16Merge branch 'elixir-1.9' into 'develop'rinpatch
2020-06-16Upgrade to Elixir 1.9Steven Fuchs
2020-06-16Merge branch 'fix/1787-mogrify-args' into 'develop'lain
2020-06-16namingAlexander Strizhakov
2020-06-16fix attemps to merge mapAlexander Strizhakov
2020-06-16fix for updated hackneyAlexander Strizhakov
2020-06-16Mogrify args as custom tuplesAlexander Strizhakov
2020-06-15Merge branch 'merge-ogp-twitter-parsers' into 'develop'lain
2020-06-15Fix testsEgor Kislitsyn
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-15Changelog: Add info about conversation view changes.lain
2020-06-15Conversations: Return last dm for conversation, not last message.lain
2020-06-15Merge branch 'notifications-filtering' into 'develop'lain
2020-06-14Mastodon API: ensure the notification endpoint doesn't return less than the r...eugenijm
2020-06-13Merge branch '1851-favorites-pagination' into 'develop'rinpatch
2020-06-13ControllerHelper: Always return id field.lain
2020-06-13Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-13Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-13Fix atom leak in Rich Media ParserEgor Kislitsyn
2020-06-12Merge branch 'patch-1' into 'develop'Haelwenn
2020-06-12Merge branch 'recipients-experiments' into 'develop'Haelwenn
2020-06-12Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2Egor Kislitsyn
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-12Merge branch 'global-status-expiration' into 'develop'lain
2020-06-12Apply suggestion to config/description.exslain
2020-06-12Merge branch 'features/mix-task-reset-mfa' into 'develop'feld
2020-06-12Merge branch 'chore/bump-changelog' into 'develop'feld
2020-06-12Document new mix task feature to reset mfaMark Felder
2020-06-12Merge branch 'develop' into features/mix-task-reset-mfaMark Felder
2020-06-12Add changelog entry for emoji pack reload commandMark Felder
2020-06-12Merge branch 'feature/cli-reload-emoji' into 'develop'lain
2020-06-12Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'feld
2020-06-12[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov