aboutsummaryrefslogtreecommitdiff
path: root/test/web/pleroma_api
AgeCommit message (Collapse)Author
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-07EmojiReactions: Remove old API endpointsLain Soykaf
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-01-30Merge branch 'emoji-api-errors' into 'develop'feld
Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161
2020-01-29emoji api error on not writable dirAlexander Strizhakov
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-24Emoji reactions: Change api format once morelain
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
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-19Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵eugenijm
conversations as read
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-02PleromaAPI: Add unreacting.lain
2019-10-02Merge remote-tracking branch 'origin/develop' into reactionslain
2019-09-30.lain
2019-09-30Extract mascot actions from `MastodonAPIController` to MascotControllerEgor Kislitsyn
2019-09-30Add PleromaAPI.AccountControllerEgor Kislitsyn
2019-09-30Merge remote-tracking branch 'origin/develop' into reactionslain
2019-09-30change new scrobble endpointAriadne Conill
2019-09-30test: fix scrobble controller testsAriadne Conill
2019-09-30pleroma api: hook up scrobbler controllerAriadne Conill
2019-09-29Revert subscription refactoring.rinpatch
As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365.
2019-09-26Merge developRoman Chvanikov
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-23Emoji API Controller: Follow phoenix directory structurerinpatch
2019-09-17Move pleroma_api controllers into controllers sub-foldersRoman Chvanikov
2019-09-17Rename SubscriptionNotificationController list and get actions to index and showRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-16Move subscription notifications to a separate controllerRoman Chvanikov
2019-09-13Merge remote-tracking branch 'origin/develop' into reactionslain
2019-09-13ActivityPub: Use is_unicode_emoji? function.lain
2019-09-12PleromaAPIController: Add endpoint to fetch emoji reactions.lain
2019-09-04PleromaAPIController: Add emoji reactions.lain
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
as read and make it respond with Mastoapi entities
2019-08-12Conversation: Add endpoint to get a conversation by id.lain
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 23:21:55 +0000