Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts: # CHANGELOG.md
No related tags found
Showing
- CHANGELOG.md 2 additions, 0 deletionsCHANGELOG.md
- lib/pleroma/emails/admin_email.ex 1 addition, 1 deletionlib/pleroma/emails/admin_email.ex
- lib/pleroma/plugs/oauth_scopes_plug.ex 29 additions, 4 deletionslib/pleroma/plugs/oauth_scopes_plug.ex
- lib/pleroma/signature.ex 1 addition, 1 deletionlib/pleroma/signature.ex
- lib/pleroma/user.ex 6 additions, 2 deletionslib/pleroma/user.ex
- lib/pleroma/web/activity_pub/views/user_view.ex 2 additions, 2 deletionslib/pleroma/web/activity_pub/views/user_view.ex
- lib/pleroma/web/admin_api/admin_api_controller.ex 62 additions, 0 deletionslib/pleroma/web/admin_api/admin_api_controller.ex
- lib/pleroma/web/masto_fe_controller.ex 12 additions, 0 deletionslib/pleroma/web/masto_fe_controller.ex
- lib/pleroma/web/mastodon_api/controllers/account_controller.ex 48 additions, 0 deletions...leroma/web/mastodon_api/controllers/account_controller.ex
- lib/pleroma/web/mastodon_api/controllers/app_controller.ex 3 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/app_controller.ex
- lib/pleroma/web/mastodon_api/controllers/conversation_controller.ex 6 additions, 0 deletions...a/web/mastodon_api/controllers/conversation_controller.ex
- lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex 13 additions, 0 deletions...a/web/mastodon_api/controllers/domain_block_controller.ex
- lib/pleroma/web/mastodon_api/controllers/filter_controller.ex 12 additions, 0 deletions...pleroma/web/mastodon_api/controllers/filter_controller.ex
- lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex 10 additions, 0 deletions...web/mastodon_api/controllers/follow_request_controller.ex
- lib/pleroma/web/mastodon_api/controllers/list_controller.ex 11 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/list_controller.ex
- lib/pleroma/web/mastodon_api/controllers/media_controller.ex 5 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/media_controller.ex
- lib/pleroma/web/mastodon_api/controllers/notification_controller.ex 12 additions, 0 deletions...a/web/mastodon_api/controllers/notification_controller.ex
- lib/pleroma/web/mastodon_api/controllers/poll_controller.ex 10 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/poll_controller.ex
- lib/pleroma/web/mastodon_api/controllers/report_controller.ex 6 additions, 0 deletions...pleroma/web/mastodon_api/controllers/report_controller.ex
- lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex 8 additions, 0 deletions...mastodon_api/controllers/scheduled_activity_controller.ex
Loading
Please register or sign in to comment