summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-04Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini
Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737
2019-10-04Merge branch 'bugfix/notification-nil-actor' into 'develop'lain
notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-02[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-02Move `:favourites` and `:bookmarks` actions to StatusControllerEgor Kislitsyn
2019-10-02Move `follows`, `mutes` and `blocks` actions to AccountControllerEgor Kislitsyn
2019-10-02Add MastoFEControllerEgor Kislitsyn
2019-10-02Add CustomEmojiControllerEgor Kislitsyn
2019-10-02Extract instance actions from `MastodonAPIController` to `InstanceController`Egor Kislitsyn
2019-10-02Merge branch 'split-masto-api/auth' into 'develop'kaniini
Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759
2019-10-02Merge branch 'features/private-reblogs' into 'develop'kaniini
Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766
2019-10-01Revert "Add upload limits to /api/v1/instance"feld
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01Store private announcements in object.data["announcements"], filter them on ↵Thibaut Girka
display
2019-10-01Add tests for privately announcing statuses via APIThibaut Girka
2019-10-01Extract auth actions from `MastodonAPIController` to `AuthController`Egor Kislitsyn
2019-10-01Extract apps actions from `MastodonAPIController` to `AppController`Egor Kislitsyn
2019-10-01Extract suggestions actions from `MastodonAPIController` to ↵Egor Kislitsyn
`SuggestionController`
2019-10-01Extract media actions from `MastodonAPIController` to `MediaController`Egor Kislitsyn
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 08:48:50 +0000