aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2019-10-01Extract poll actions from `MastodonAPIController` to `PollController`Egor Kislitsyn
2019-10-01Add `rel="ugc"`kPherox
2019-10-01Merge remote-tracking branch 'upstream/develop' into ↵kPherox
fix-prameter-name-of-accounts-update-credentials
2019-09-30Extract mascot actions from `MastodonAPIController` to MascotControllerEgor Kislitsyn
2019-09-30Move update_credentials to MastodonAPI.AccountControllerEgor Kislitsyn
2019-09-30Move account_register, relationships and verify_credentials to ↵Egor Kislitsyn
MastodonAPI.AccountController
2019-09-30Move account_lists test to MastodonAPI.AccountControllerTestEgor Kislitsyn
2019-09-30Disable async in DomainBlockControllerTestEgor Kislitsyn
2019-09-30Add PleromaAPI.AccountControllerEgor Kislitsyn
2019-09-30Fix mergeEgor Kislitsyn
2019-09-30Fix ReportControllerTestEgor Kislitsyn
2019-09-30Merge branch 'split-masto-api/reports' into 'develop'kaniini
Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744
2019-09-30Merge branch 'split-masto-api/conversations' into 'develop'kaniini
Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743
2019-09-30Extract report actions from `MastodonAPIController` to `ReportController`Egor Kislitsyn
Update MastodonAPI.ReportView
2019-09-30mastodon api: implement rendering of listen activitiesAriadne Conill
2019-09-30Extract conversation actions from `MastodonAPIController` to ↵Egor Kislitsyn
ConversationController
2019-09-29Revert subscription refactoring.rinpatch
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365.
2019-09-29Merge branch 'feature/follow-requests-count' into 'develop'kaniini
Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726
2019-09-28Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-28status_controller.ex: Posting media status without content definedHaelwenn (lanodan) Monnier
2019-09-28Fix not being able to post empty statuses with attachmentsrinpatch
Attachment field was filled in after the empty status check
2019-09-27Merge branch 'split-masto-api/follow-requests' into 'develop'kaniini
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730
2019-09-27Merge branch 'split-masto-api/domain-blocks' into 'develop'kaniini
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729
2019-09-27Merge branch 'split-masto-api/scheduled-statuses' into 'develop'kaniini
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728
2019-09-27Extract domain blocks actions from `MastodonAPIController` to ↵Egor Kislitsyn
`DomainBlockController`
2019-09-27Extract follow requests actions from `MastodonAPIController` to ↵Egor Kislitsyn
`FollowRequestController`
2019-09-27Extract scheduled statuses actions from `MastodonAPIController` to ↵Egor Kislitsyn
`ScheduledActivityController`
2019-09-27Extract filter actions from `MastodonAPIController` to `FilterController`Egor Kislitsyn
2019-09-27Merge branch 'refactor/status-controller' into 'develop'kaniini
Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719
2019-09-27mastodon api: implement follow_requests_countAriadne Conill
2019-09-27Move view logic from StatusController.context to StatusView and add a testEgor Kislitsyn
2019-09-27Move StatusController tests from MastodonAPIControllerTest to ↵Egor Kislitsyn
StatusControllerTest
2019-09-27Merge branch 'refactor/subscription' into 'develop'kaniini
Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor Kislitsyn
2019-09-26Merge branch 'refactor/notification-controller' into 'develop'kaniini
Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Extract notification actions from `MastodonAPIController` into ↵Egor Kislitsyn
`NotificationController`
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23updated testsMaksim Pechnikov
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-20Mastodon API: Fix private and direct statuses not being filtered out from ↵eugenijm
the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-09-19[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 Add `rel="ugc"` to hashtags and mentionsEgor Kislitsyn
2019-09-19Add support for `rel="ugc"`Egor Kislitsyn