aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-23Add an index on object likesrinpatch
In !1538 favorites timeline was switched to use the joined object, but no idex on likes in the joined object was added.
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
fixed clear config after test See merge request pleroma/pleroma!1588
2019-08-22Merge branch 'improve-ap-routes-rate-limit' into 'develop'lain
Improve AP routes rate limit See merge request pleroma/pleroma!1590
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
[#1174] Rate limit AP routes See merge request pleroma/pleroma!1586
2019-08-20Merge branch 'chore/fix-flakey-aws-test' into 'develop'kaniini
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 See merge request pleroma/pleroma!1587
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
Fix deactivated user deletion See merge request pleroma/pleroma!1546
2019-08-20Add `:ap_routes` rate limitEgor Kislitsyn
2019-08-20Merge branch 'digest-template' into 'develop'lain
Improve digest email template See merge request pleroma/pleroma!1565
2019-08-20Update CHANGELOGEgor Kislitsyn
2019-08-20Merge branch 'feature/custom-fields' into 'develop'lain
Add custom profile fields See merge request pleroma/pleroma!1488
2019-08-19Refactor check_actor_is_activeMaxim Filippov
2019-08-19Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'lain
Reverse Proxy max_body_size is incorrect See merge request pleroma/pleroma!1581
2019-08-19Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'lain
# Conflicts: # CHANGELOG.md
2019-08-19Merge branch 'tests/database-digest-tests' into 'develop'lain
Add more tests for Database tasks and DigestEmailWorker See merge request pleroma/pleroma!1577
2019-08-19Add more tests for Database tasks and DigestEmailWorkerSergey Suprunenko
2019-08-19Merge branch 'support/test_helpers' into 'develop'lain
added test helpers to clear config after tests See merge request pleroma/pleroma!1547
2019-08-19added test helpers to clear config after testsMaksim
2019-08-19Merge branch 'hotfix/user_unfollow' into 'develop'lain
[#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579
2019-08-19removes duplicates from relay subscription listMaksim Pechnikov
2019-08-18Merge branch 'chore/fix-ap-muted-tests' into 'develop'kaniini
tests: activitypub: fix muted thread tests See merge request pleroma/pleroma!1584
2019-08-18tests: activitypub: fix typoAriadne Conill
2019-08-18Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'kaniini
Clear follow requests when blocking a user See merge request pleroma/pleroma!1583
2019-08-18Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini
Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575
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
Extended Pleroma Conversations See merge request pleroma/pleroma!1535
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
Fix OAuth cleanup worker unconditionally starting See merge request pleroma/pleroma!1578
2019-08-15Fix OAuth cleanup worker unconditionally startingrinpatch
!1576 removed enabled/disabled check from the worker, in favor of just not starting it in application.ex if disabled. However a line unconditionally starting the worker was removed
2019-08-15Merge branch 'features/formatting-sub_sup' into 'develop'kaniini
html.ex: Allow sub and sup elements by default Closes #1191 See merge request pleroma/pleroma!1572
2019-08-15Merge branch 'feature/parallel-rendering' into 'develop'lain
Parallelize template rendering See merge request pleroma/pleroma!1576
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
Cache follow state Closes #1180 See merge request pleroma/pleroma!1573
2019-08-14Merge branch 'develop' into 'fix/admin-api-user-deletion'Maxim Filippov
# Conflicts: # CHANGELOG.md
2019-08-15Fix CHANGELOG entryMaxim Filippov
2019-08-15Do not check if actor is active when deleting a userMaxim Filippov
2019-08-14Merge branch 'fix/stats-send-after' into 'develop'rinpatch
Collect stats immediately after init See merge request pleroma/pleroma!1574