summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-27Remove most of TwitterAPIControllerrinpatch
2019-08-26Transmogrifier: Handle incoming emoji reactions.lain
2019-08-26ActivityPub: Basic EmojiReactions.lain
2019-08-26Merge branch 'fix-typo' into 'develop'lain
Fix typo See merge request pleroma/pleroma!1603
2019-08-26Transmogrifier: Fix follow handling when the actor is an object.lain
2019-08-27Fix typoEgor Kislitsyn
2019-08-26Merge branch 'fix/sporadic-test' into 'develop'rinpatch
Fix sporadic test Closes #1221 See merge request pleroma/pleroma!1602
2019-08-26Fix sporadic testMaxim Filippov
2019-08-26Merge branch 'disable-rate-limiter' into 'develop'kaniini
Disable rate limiter by default Closes #1217 See merge request pleroma/pleroma!1601
2019-08-26Disable rate limiter by defaultEgor Kislitsyn
2019-08-26Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers ↵Egor Kislitsyn
and test/web/mastodon_api/views
2019-08-26Move mastodon_api/*_controller.ex to mastodon_api/controllers/Egor Kislitsyn
2019-08-26Extract MastodonAPIController's list actions into ↵Egor Kislitsyn
MastodonAPI.ListController; Add more tests
2019-08-26Extract MastodonAPI.MastodonAPIController.errors/2 to ↵Egor Kislitsyn
MastodonAPI.FallbackController
2019-08-26Add validation in Pleroma.List.create/2Egor Kislitsyn
2019-08-26Extract if block into private functionkPherox
2019-08-26Update test for custom fields when content-type urlencodedkPherox
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
[#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589
2019-08-25Merge branch 'feature/moderation-log' into 'develop'kaniini
Log admin/moderator actions See merge request pleroma/pleroma!1582
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596
2019-08-26Update test for custom fields when name empty stringkPherox
2019-08-26Update test for custom profile fieldskPherox
2019-08-25Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain
Implement missing mocks for rel=me See merge request pleroma/pleroma!1598
2019-08-25Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch
HttpRequestMock: Log non-implemented mock responses Closes #1088 See merge request pleroma/pleroma!1416
2019-08-25HttpRequestMock: Remove useless `error = error`Haelwenn (lanodan) Monnier
2019-08-25user_test.exs: fix rel=me testsHaelwenn (lanodan) Monnier
2019-08-25Implement missing mocks for rel=meHaelwenn (lanodan) Monnier
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