aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-01-23restart config id after truncateAlexander Strizhakov
2020-01-23truncate config table on migrate to db taskAlexander Strizhakov
2020-01-23fixed delete ScheduledActivityMaksim Pechnikov
2020-01-23fix for migrate to db testAlexander Strizhakov
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-23removed try/rescueMaksim Pechnikov
2020-01-23Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.exMaksim
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
2020-01-23Merge branch 'develop' into 'develop'Haelwenn
2020-01-22Updated OpenBSD installation guide for version OpenBSD 6.6Farhan Khan
2020-01-22Update changeloglain
2020-01-22Document new EmojiReaction notificationslain
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22Merge branch 'no-error-404' into 'develop'rinpatch
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Merge branch 'admin-be' into 'develop'feld
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22little fixesAlexander Strizhakov
2020-01-22docs updateAlexander Strizhakov
2020-01-22Merge branch 'mastofe/bundle-2020-01-22' into 'develop'rinpatch
2020-01-22Update MastoFE bundle to 2020-01-22Haelwenn (lanodan) Monnier
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
2020-01-22Emoji reactions: Document changeslain
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Revert "Update AdminFE build"Alexander Strizhakov
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' into 'develop'feld
2020-01-21Merge branch 'update/adminfe-20200121-part2' into 'develop'feld
2020-01-21Last AdminFE update was accidentally built from master, not developMark Felder
2020-01-21Merge branch 'update/adminfe-20200121' into 'develop'feld
2020-01-21Update AdminFE buildMark Felder
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma ...Roman Chvanikov
2020-01-21Add delete_attachments queue to configRoman Chvanikov
2020-01-21Merge branch 'develop' into fix/attachments-cleanupRoman Chvanikov
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
2020-01-21Merge branch 'issue/1484' into 'develop'lain
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-21fix for db keyAlexander Strizhakov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'develop' into fix/attachments-cleanupMark Felder
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-react...lain
2020-01-20Merge branch '1521-admin-report-test-fix' into 'develop'lain