aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-04Merge branch 'feature/mastoapi-read-notifications' into 'develop'Haelwenn
2019-09-04Clarify that read notifications are returnedrinpatch
2019-09-04Apply suggestion to docs/api/pleroma_api.mdrinpatch
2019-09-04Apply suggestion to lib/pleroma/notification.exrinpatch
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
2019-09-03Merge branch 'feature/pagination-total' into 'develop'rinpatch
2019-09-03Return "total" optionallyMaxim Filippov
2019-09-02Return total from pagination + testsMaxim Filippov
2019-08-30Merge branch 'iss-930-media' into 'develop'feld
2019-08-30Fix missing changes in pleroma/pleroma!1197kPherox
2019-08-30Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini
2019-08-30Fix AntiFollowbotPolicy when trying to follow a relayfeld
2019-08-28Merge branch 'fix-osada-follow' into 'develop'Haelwenn
2019-08-27Merge branch 'list-controller' into 'develop'lain
2019-08-27Merge branch 'tests/activity_pub' into 'develop'lain
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-26Merge branch 'fix-typo' into 'develop'lain
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
2019-08-26Fix sporadic testMaxim Filippov
2019-08-26Merge branch 'disable-rate-limiter' into 'develop'kaniini
2019-08-26Disable rate limiter by defaultEgor Kislitsyn
2019-08-26Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers an...Egor Kislitsyn
2019-08-26Move mastodon_api/*_controller.ex to mastodon_api/controllers/Egor Kislitsyn
2019-08-26Extract MastodonAPIController's list actions into MastodonAPI.ListController;...Egor Kislitsyn
2019-08-26Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackCon...Egor Kislitsyn
2019-08-26Add validation in Pleroma.List.create/2Egor Kislitsyn
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
2019-08-25Merge branch 'feature/moderation-log' into 'develop'kaniini
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
2019-08-26Update test for custom profile fieldskPherox
2019-08-25Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain
2019-08-25Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'rinpatch
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 use attachment only when fields do not existkPherox
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
2019-08-24Merge branch 'activity-expiration' into 'develop'kaniini
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