summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-25HttpRequestMock: Improve non-implemented error messageHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Log mock errors as warningsHaelwenn (lanodan) Monnier
2019-08-25Change to delete empty name fieldkPherox
2019-08-25Fix type of fields_attributeskPherox
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-08-25Rename fields to fields_attributeskPherox
2019-08-25Change to use attachment only when fields do not existkPherox
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
user creation admin api will create multiple users See merge request pleroma/pleroma!1170
2019-08-24Merge branch 'activity-expiration' into 'develop'kaniini
Activity expiration See merge request pleroma/pleroma!1595
2019-08-24Update CHANGELOG.mdlain
2019-08-24Activity expiration: Fix docs.lain
2019-08-24Activity Expiration: Switch to 'expires_in' system.lain
2019-08-24ActivityExpirationWorker: Fix merge issues.lain
2019-08-24update testsMaksim Pechnikov
2019-08-24 put_resp_header("content-type", "application/activity+json") -> ↵Maksim Pechnikov
put_resp_content_type("application/activity+json")
2019-08-24Merge remote-tracking branch 'origin/develop' into ↵lain
sixohsix/pleroma-post_expiration
2019-08-24Minor corrections and clarification for Alpine standard v.3.10ultem
2019-08-24add testsMaksim Pechnikov
2019-08-24Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-24[#1149] Updated docs & tests.Ivan Tashkinov
2019-08-23Merge branch 'fix-default-config-account_field' into 'develop'kaniini
Fix default config of account fields length See merge request pleroma/pleroma!1593
2019-08-23Fix default config of account fields lengtharies
2019-08-23[#1149] Introduced `quantum` job scheduler. Documentation & config changes.Ivan Tashkinov
2019-08-23[#1149] Publisher worker fix (atomized `params` keys).Ivan Tashkinov
2019-08-23[#1149] Upgraded `oban` from 0.6.0 to 0.7.1.Ivan Tashkinov
2019-08-23Merge branch 'fix/add-likes-index-objects' into 'develop'kaniini
Add an index on object likes See merge request pleroma/pleroma!1592
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 remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-22[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs
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