aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
Hashtag benchmarks See merge request pleroma/pleroma!2116
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
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-15Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15Merge branch 'develop' into 'feature/tag_feed'lain
# Conflicts: # CHANGELOG.md
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-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
[#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10deep merge in config updateAlexander Strizhakov
2020-01-10flag for delete fixAlexander
2020-01-10little fixes and typos fixAlexander
2020-01-10fixes for logger backendsAlexander
2020-01-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
2020-01-10errors on endpointsAlexander
2020-01-10partially settings updateAlexander
2020-01-10config editing through databaseAlex S
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2020-01-08fix create service actorMaksim Pechnikov
2020-01-03fixed Metadata.Utils.scrub_html_and_truncateMaksim Pechnikov
2020-01-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-24fix oauth scopes for AdminApi#reports_updateMaksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.exMaksim
2019-12-22Apply suggestion to ↵Maksim
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-21Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch
Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039
2019-12-20Posts without media attachments should get the Summary TwitterCardMark Felder
2019-12-20fixed remote followMaksim Pechnikov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov