summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers
AgeCommit message (Collapse)Author
2019-10-29Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-24Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-22Marker: added unread_count fieldMaksim Pechnikov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-19change Maksim's test descriptionAriadne Conill
2019-10-19fix testMaksim Pechnikov
2019-10-19added test fo Pleroma.Web.MastodonAPI.StatusControllerMaksim Pechnikov
2019-10-19StatusControllerTest: Capture log.lain
2019-10-18tests: mastodon search: search for an account that is visible via ↵Ariadne Conill
activitypub, not ostatus
2019-10-18kill almost all of the OStatus moduleAriadne Conill
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a ↵eugenijm
new direct message
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-16Introduce new ingestion pipeline structure, implement internal Likes with it.lain
2019-10-14Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵eugenijm
notification endpoints
2019-10-11SearchController: Fix test.lain
Turns out you can't actually find the user with this.
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-09Merge branch 'unicode-search' into 'develop'kaniini
Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824
2019-10-09Search: Add tests for unicode searches.lain
2019-10-09Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status ↵eugenijm
(`GET /api/v1/statuses/:id`)
2019-10-06Merge 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/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
[#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
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 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-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-30Move update_credentials to MastodonAPI.AccountControllerEgor Kislitsyn
2019-09-30Move account_register, relationships and verify_credentials to ↵Egor Kislitsyn
MastodonAPI.AccountController
2019-09-30Disable async in DomainBlockControllerTestEgor Kislitsyn
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 19:49:35 +0000