aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
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-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-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-19Fix credo warningRoman Chvanikov
2020-01-19Delete attachments asynchronouslyRoman Chvanikov
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-17Delete attachments after object and cache cleanupRoman Chvanikov
2020-01-17return db key on update requestsAlexander Strizhakov
2020-01-17some clean upAlexander Strizhakov
2020-01-17updated error messages for authentication processMaksim Pechnikov
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 '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-14Check if object->data is array when looking up attachment objects to deleteRoman Chvanikov
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-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
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-11Remove MDII uploaderHakaba Hitoyo
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-10fix for subgroup tupleAlexander
added settings for swoosh adapters local
2020-01-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
2020-01-10fix for endpoints after env updateAlexander
2020-01-10errors on endpointsAlexander