aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21remote_follow_controller.ex: Redirect to the user page on successHaelwenn (lanodan) Monnier
2020-01-21some refactor and testsAlexander Strizhakov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
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' of git.pleroma.social:pleroma/pleroma into emoji-react...lain
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
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-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-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-18full update for some subkeysAlexander Strizhakov
2020-01-17return db key on update requestsAlexander Strizhakov
2020-01-17updated error messages for authentication processMaksim Pechnikov
2020-01-17saving to DB only added by user settingsAlexander Strizhakov
2020-01-16renamingAlexander Strizhakov
2020-01-15Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-15Merge branch 'develop' into 'feature/tag_feed'lain
2020-01-15little cleanupAlexander Strizhakov
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-15[#1478] Adjusted AdminAPIController admin subscope requirements.Ivan Tashkinov
2020-01-14Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-13Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-12Merge branch 'issue/1354' into 'develop'feld
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-10Merge branch 'issue/1490' into 'develop'lain
2020-01-10deep merge in config updateAlexander Strizhakov
2020-01-10flag for delete fixAlexander
2020-01-10little fixes and typos fixAlexander