Merge remote-tracking branch 'upstream/develop' into attachment-meta
[akkoma] / lib / pleroma / web / admin_api / controllers / user_controller.ex
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop'
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop'
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop'
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-10 HaelwennMerge branch 'openapi/admin/user' into 'develop'
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-03-02 Egor KislitsynAdd OpenAPI spec for AdminAPI.UserController
2021-02-28 lainMerge branch 'features/reports-enhancements' into ...
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-18 rinpatchMerge branch 'fix/chats-no-unread-in-openapi' into...
2021-02-17 HaelwennMerge branch 'feat/enforce-admin-scope-unconditionally...
2021-02-17 rinpatchOAuthScopesPlug: remove transform_scopes in favor of...
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop'
2021-02-03 rinpatchMerge branch 'feat/openapi-spec-export' into 'develop'
2021-01-26 feldMerge branch 'service-worker-allowed-header' into ...
2021-01-26 lainMerge branch 'develop' into '2435-list-multiple-users'
2021-01-26 HaelwennMerge branch 'fix/missing-own_votes' into 'develop'
2021-01-25 Mark FelderMerge branch 'develop' into docs/apache-config
2021-01-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-25 feldMerge branch 'refactor/deactivated_user_field' into...
2021-01-25 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-18 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field
2021-01-15 Mark FelderMake setting user activation status explicit
2021-01-15 Mark FelderChange user.deactivated field to user.is_active
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-03 lainMerge branch 'chores/pleroma-favicon-logo' into 'develop'
2020-11-02 lainMerge branch 'bugfix/poll_replies_count' into 'develop'
2020-11-02 minibikiniMerge branch 'develop' into 'frontend-admin-api'
2020-10-30 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-30 minibikiniMerge branch 'develop' into 'feature/local-only-scope'
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-29 feldMerge branch 'fix/frontend-cli-docs' into 'develop'
2020-10-29 feldMerge branch 'issue/2137-user-filters-admin-fe' into...
2020-10-22 Maksim Pechnikovfix module name
2020-10-22 Maksim Pechnikovadmin api: added user filters by `actor_types`
2020-10-22 Maksim Pechnikovneed_confirmed -> unconfirmed
2020-10-22 Maksim Pechnikovadded AdminApi.UserController