aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2020-01-14Merge branch 'warnings-fix' into 'develop'lain
compilation warnings fix See merge request pleroma/pleroma!2102
2020-01-14compilation warnings fixAlexander Strizhakov
2020-01-14short labels and fixes for typosAlexander Strizhakov
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-13Merge branch 'feature/ci-registry' into 'develop'lain
Update Dockerfile with labels. Update gitlab-ci for registry usage See merge request pleroma/pleroma!2098
2020-01-13Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-12Merge branch 'feature/attachments-cleanup' into 'develop'feld
Delete attachments when status is deleted See merge request pleroma/pleroma!2036
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 'config/benchmark' into 'develop'feld
Benchmark env uses test database so we should be able to use test.secret.exs See merge request pleroma/pleroma!2057
2020-01-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Assign token that can write to followsMark Felder
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 'patch-1' into 'develop'rinpatch
docs: API: update Mastodon API link See merge request pleroma/pleroma!2100
2020-01-11Merge branch 'remove/remove-mdii-uploader' into 'develop'rinpatch
Remove MDII uploader See merge request pleroma/pleroma!2099
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-11docs: API: update Mastodon API linkAlibek Omarov
2020-01-10Update Dockerfile with labels. Update gitlab-ci for registry usagejp
2020-01-10don't migrate prometheus settingsAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10don't migrate configurable_from_database settingAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
and moving it from instance settings
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10syncing new setting to descriptions.exsAlexander 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-10Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'lain
OAuth tweaks and tests rework See merge request pleroma/pleroma!2068
2020-01-10Update AdminFE buildAlexander Strizhakov
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-10suggestions fixAlexander
2020-01-10typo fixAlexander
2020-01-10adapter childrenAlexander
2020-01-10fix for endpoints after env updateAlexander
2020-01-10test fixes after rebaseAlexander
2020-01-10errors on endpointsAlexander
2020-01-10partially settings updateAlexander
2020-01-10tests for setttings without an explicit keyAlexander
2020-01-10config editing through databaseAlex S
2020-01-10Merge branch 'release/1.1.8' into 'stable'v1.1.8lain
Release/1.1.8 See merge request pleroma/pleroma!2096
2020-01-10Update version to 1.1.8lain
2020-01-101.1.8 Changeloglain