aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 'admin-be' into 'develop'feld
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-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 '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-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
2020-01-20[#1521] AdminApiControllerTest: fixed create report test (OAuth).Ivan Tashkinov
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
2020-01-20Update changeloglain
2020-01-20merge fixAlexander Strizhakov
2020-01-20StatusView: Add `emoji_reactions`lain
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
2020-01-20StatusControllerTest: Fix typolain
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
2020-01-20CommonAPI: Don't error out on double favs/repeatslain
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
2020-01-20Add benchmark of any/all tag optionslain
2020-01-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-20Merge branch 'features/cleanup-incoming-actor' into 'develop'rinpatch
2020-01-20Merge branch 'feat/startup-migration-check' into 'develop'lain
2020-01-20Check for unapplied migrations on startuprinpatch