summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-22Revert "Update AdminFE build"Alexander Strizhakov
This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-21fix for db keyAlexander Strizhakov
2020-01-20Merge branch '1521-admin-report-test-fix' into 'develop'lain
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth) Closes #1521 See merge request pleroma/pleroma!2121
2020-01-20[#1521] AdminApiControllerTest: fixed create report test (OAuth).Ivan Tashkinov
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119
2020-01-20Update changeloglain
2020-01-20merge fixAlexander Strizhakov
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
Bump credo to 1.1.5 See merge request pleroma/pleroma!2115
2020-01-20StatusControllerTest: Fix typolain
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117
2020-01-20CommonAPI: Don't error out on double favs/repeatslain
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
Hashtag benchmarks See merge request pleroma/pleroma!2116
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
transmogrifier.ex: simplify handle_incoming of actors See merge request pleroma/pleroma!2114
2020-01-20Merge branch 'feat/startup-migration-check' into 'develop'lain
Check for unapplied migrations on startup Closes #1328 See merge request pleroma/pleroma!2112
2020-01-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-19mix.lock: update mock to 0.3.4rinpatch
This version adds Mock.passthrough/1 which I need to use in a test
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-18releases supportAlexander Strizhakov
2020-01-18full update for some subkeysAlexander Strizhakov
2020-01-17return db key on update requestsAlexander Strizhakov
2020-01-17some clean upAlexander Strizhakov
2020-01-17revert non needableAlexander Strizhakov
2020-01-17configure only console backendAlexander Strizhakov
2020-01-17compile fixAlexander Strizhakov
2020-01-17fix for config loaderAlexander Strizhakov
2020-01-17saving to DB only added by user settingsAlexander Strizhakov
2020-01-16renamingAlexander Strizhakov
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-15Merge branch 'ci/docker-imaging' into 'develop'feld
ci/docker imaging See merge request pleroma/pleroma!2110
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 ↵jp
image builds on unnecessary forks
2020-01-15Fix odd spacingjp
2020-01-15Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'lain
[#1478] OAuth `admin` scopes tweaks Closes #1478 See merge request pleroma/pleroma!2081
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15little cleanupAlexander Strizhakov
2020-01-15don't migrate Pleroma.Web.EndPoint settingsAlexander Strizhakov
don't set Logger level to all tasks
2020-01-15Merge branch 'notifications-from-account' into 'develop'lain
[#1470] Add support for `account_id` param to filter notifications by the account See merge request pleroma/pleroma!2073
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-15Benchmarks: Move to correct folderlain
2020-01-15[#1478] Adjusted AdminAPIController admin subscope requirements.Ivan Tashkinov
2020-01-14Merge branch 'features/docker-updates' into 'develop'feld
Features/docker updates See merge request pleroma/pleroma!2105