summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-31Remove Mention of TwitterAPI in readmerinpatch
2019-08-31Remove Activity, User and Notification views from TwitterAPIrinpatch
2019-08-31Update Japanese document to follow English documentAkiraFukushima
2019-08-31Remove most of Pleroma.Web.TwitterAPI.TwitterAPIrinpatch
2019-08-31added Emoji structMaksim Pechnikov
2019-08-31StyleMaxim Filippov
2019-08-31Add ability to search moderation logsMaxim Filippov
2019-08-30minor: Fix version dotultem
2019-08-30added Emoji.FormatterMaksim Pechnikov
2019-08-30Merge branch 'iss-930-media' into 'develop'feld
Fix missing changes in pleroma/pleroma!1197 See merge request pleroma/pleroma!1613
2019-08-30Fix missing changes in pleroma/pleroma!1197kPherox
2019-08-30Apply suggestion to lib/pleroma/emoji/loader.exMaksim
2019-08-30added code\path fields without html tags in etsMaksim Pechnikov
2019-08-30division emoji.ex on loader.ex and emoji.exMaksim Pechnikov
2019-08-30Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini
Fix AntiFollowbotPolicy when trying to follow a relay Closes #1231 See merge request pleroma/pleroma!1610
2019-08-30Fix AntiFollowbotPolicy when trying to follow a relayfeld
2019-08-28Merge branch 'fix-osada-follow' into 'develop'Haelwenn
Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604
2019-08-27Merge branch 'list-controller' into 'develop'lain
Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600
2019-08-27Merge branch 'tests/activity_pub' into 'develop'lain
added tests for ActivityPub.like\unlike See merge request pleroma/pleroma!1606
2019-08-27Filter logs by dateMaxim Filippov
2019-08-27Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exMaksim
2019-08-27Transmogrifier: Use Containment.get_actor to get actors.lain
2019-08-27added tests for ActivityPub.like\unlikeMaksim Pechnikov
2019-08-27[#1149] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with ↵Ivan Tashkinov
WebsubServerSubscription.
2019-08-27Remove most of TwitterAPIControllerrinpatch
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