aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-23Merge branch 'fix-default-config-account_field' into 'develop'kaniini
2019-08-23Fix default config of account fields lengtharies
2019-08-23Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini
2019-08-23Add an index on object likesrinpatch
2019-08-22fix /inbox for RelayMaksim Pechnikov
2019-08-22fix testMaksim Pechnikov
2019-08-22Merge branch 'develop' into issue/1177Maksim Pechnikov
2019-08-22Merge branch 'support/tests' into 'develop'feld
2019-08-22Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain
2019-08-22Improve AP routes rate limitEgor Kislitsyn
2019-08-22fixed unfollow for relay actorMaksim Pechnikov
2019-08-22remove old user create and delete routes for adminSachin Joshi
2019-08-21fixed clear config after testMaksim Pechnikov
2019-08-21Merge branch 'rate-limit-ap-routes' into 'develop'lain
2019-08-20Merge branch 'chore/fix-flakey-aws-test' into 'develop'kaniini
2019-08-20test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1Ariadne Conill
2019-08-20Merge branch 'fix/admin-api-user-deletion' into 'develop'lain
2019-08-20Add `:ap_routes` rate limitEgor Kislitsyn
2019-08-20Merge branch 'digest-template' into 'develop'lain
2019-08-20Update CHANGELOGEgor Kislitsyn
2019-08-20Merge branch 'feature/custom-fields' into 'develop'lain
2019-08-19Refactor check_actor_is_activeMaxim Filippov
2019-08-19Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'lain
2019-08-19Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'lain
2019-08-19Merge branch 'tests/database-digest-tests' into 'develop'lain
2019-08-19Add more tests for Database tasks and DigestEmailWorkerSergey Suprunenko
2019-08-19Merge branch 'support/test_helpers' into 'develop'lain
2019-08-19added test helpers to clear config after testsMaksim
2019-08-19Merge branch 'hotfix/user_unfollow' into 'develop'lain
2019-08-19removes duplicates from relay subscription listMaksim Pechnikov
2019-08-18Merge branch 'chore/fix-ap-muted-tests' into 'develop'kaniini
2019-08-18tests: activitypub: fix typoAriadne Conill
2019-08-18Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'kaniini
2019-08-18Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini
2019-08-18use commonAPI in testsSadposter
2019-08-18clear follow requests when blocking a userSadposter
2019-08-16Add changelog entry tooMark Felder
2019-08-16FormattingMark Felder
2019-08-16fixed User.unfollow with synchronization external userMaksim Pechnikov
2019-08-16Merge branch 'pleroma-conversations' into 'develop'lain
2019-08-16Add configurable colors and logo for the digest templateEgor Kislitsyn
2019-08-15max_body_size -> max_body_length, as it should beMark Felder
2019-08-15Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'rinpatch
2019-08-15Fix OAuth cleanup worker unconditionally startingrinpatch
2019-08-15Merge branch 'features/formatting-sub_sup' into 'develop'kaniini
2019-08-15Merge branch 'feature/parallel-rendering' into 'develop'lain
2019-08-15Parallelize template renderingrinpatch
2019-08-15Hide muted theads from home/public timelines unless `with_muted` is setrinpatch
2019-08-15Merge branch 'cache-follow-state' into 'develop'lain
2019-08-14Merge branch 'develop' into 'fix/admin-api-user-deletion'Maxim Filippov