aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/pleroma_api
AgeCommit message (Collapse)Author
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md
2019-12-06[#1427] Fixes / improvements of admin scopes support. Added tests.Ivan Tashkinov
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-11-29[#1427] Initial support for OAuth admin scopes.Ivan Tashkinov
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-11New rate limiterSteven Fuchs
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-28Merge branch 'refactor/following-relationships' into 'develop'lain
Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814
2019-10-26Mark the conversations with the blocked user as read and update the blocking ↵eugenijm
user's `unread_conversation_count`. Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
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-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-07Linting.lain
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-06[#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-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-02PleromaAPI: Add unreacting.lain
2019-10-02PleromaAPI: Fix emoji_reactions_bylain
2019-10-02Merge remote-tracking branch 'origin/develop' into reactionslain
2019-09-30PleromaAPIController: Fixes and refactoring.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-30split scrobble functions into their own controllerAriadne Conill
2019-09-30router: change scrobble timeline route from now-playing to scrobblesAriadne 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-27Fix SubscriptionNotificationViewEgor Kislitsyn
2019-09-26Merge developRoman Chvanikov
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-25Credo fix (remove parens on function definition)vaartis
2019-09-25Move emoji_dir_path & cache_seconds_per_file vaartis
2019-09-25When listing emoji packs, be sure to create the directoryEkaterina Vaartis
2019-09-25Merge branch 'develop' into issue/1218Maksim Pechnikov
2019-09-24Also pretty print pack.jsonEkaterina Vaartis
2019-09-23Emoji API Controller: Follow phoenix directory structurerinpatch
2019-09-19Get the nodeinfo address from the well-knownEkaterina Vaartis
2019-09-19Change path from nodeinfo to metadata->featuresEkaterina Vaartis
2019-09-19Move emoji reloading to admin apiEkaterina Vaartis
2019-09-19Move emoji api to pleroma api dirEkaterina Vaartis
2019-09-17Refactor SubscriptionNotificationViewRoman Chvanikov