aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 '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-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
2020-01-21Merge branch 'issue/1484' into 'develop'lain
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-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
2020-01-19Fix credo warningRoman Chvanikov
2020-01-19Add test case for attachment deletion when non-map data.url present in DBRoman Chvanikov
2020-01-19Delete attachments asynchronouslyRoman Chvanikov
2020-01-19mix.lock: update mock to 0.3.4rinpatch
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-17Delete attachments after object and cache cleanupRoman Chvanikov
2020-01-15Merge branch 'ci/docker-imaging' into 'develop'feld
2020-01-15Update docker release / stable jobsjp
2020-01-15Update docker jobs for release branches and stable branchesjp
2020-01-15Fix only: on docker develop/latest jobjp
2020-01-15update `only:` for release/ branch regex matching. and to avoid running image...jp
2020-01-15Fix odd spacingjp
2020-01-15Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'lain
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-15Merge branch 'notifications-from-account' into 'develop'lain
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-15Benchmarks: Move to correct folderlain