aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api
AgeCommit message (Collapse)Author
2019-11-29[#1427] Initial support for OAuth admin scopes.Ivan Tashkinov
2019-11-28Fetch account from report, not from status (it might be deleted)Maxim Filippov
2019-11-27Handle reopened reports with deleted statusesMaxim Filippov
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25TypoMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-14Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-14Admin API: list all statuses from a given instanceMaxim Filippov
2019-11-08Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-08Support old flag formatMaxim Filippov
2019-11-06Grouped reports with status data baked inMaxim Filippov
2019-11-05Merge branch 'develop' into feature/multiple-users-force-password-resetMaxim Filippov
2019-11-05Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-04Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain
Store status data inside flag activity See merge request pleroma/pleroma!1849
2019-11-01Force password reset for multiple usersMaxim Filippov
2019-11-01Undo dialyzer fixMaxim Filippov
2019-10-31Fix countMaxim Filippov
2019-10-31AdminAPI: Omit relay user from users listMaxim Filippov
2019-10-31Fix "the call ... will never return" warningMaxim Filippov
2019-10-27Fix report parsingMaxim Filippov
2019-10-27Merge branch 'develop' into feature/store-statuses-data-inside-flagMaxim Filippov
2019-10-23Store status data inside Flag activityMaxim Filippov
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-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov
2019-10-11Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relaysMaxim Filippov
2019-10-11Deprecate POST/DELETE ↵Maxim Filippov
/api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of ↵Maxim Filippov
deleting it
2019-10-09Ability to toggle activation status and permission group for a group of usersMaxim Filippov
2019-10-07Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-07Admin API: Reports, grouped by statusMaxim Filippov
2019-10-04Admin API: Allow changing the state of multiple reports at onceMaxim Filippov
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-09-30Fix mergeEgor Kislitsyn
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-26Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-26Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini
Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-25Allow activities pagination via limit/offsetMaxim Filippov
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-23Merge branch 'feature/force-password-reset' into 'develop'kaniini
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705
2019-09-23Clean up viewsSteven Fuchs
2019-09-22Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-22Use router helper to generate reset password linkMaxim Filippov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov