diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:46:18 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-25 01:46:18 +0900 |
| commit | 82f4e4760ed594fd858e36444dfb01f27fa8068c (patch) | |
| tree | 5d246b275698438a39b6fc2a2e3662a417cb940f /docs | |
| parent | fd24467b923bd09850979600aeb9a46f8f0c7967 (diff) | |
| parent | 34cdbcbb644e14dde562c150fa8ae2881e6a899b (diff) | |
| download | pleroma-82f4e4760ed594fd858e36444dfb01f27fa8068c.tar.gz | |
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/API/admin_api.md | 16 | ||||
| -rw-r--r-- | docs/administration/CLI_tasks/user.md | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index f64983a90..2cac317de 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -870,3 +870,19 @@ Compile time settings (need instance reboot): - Authentication: required - Params: None - Response: JSON, "ok" and 200 status + +## `PATCH /api/pleroma/admin/users/confirm_email` + +### Confirm users' emails + +- Params: + - `nicknames` +- Response: Array of user nicknames + +## `PATCH /api/pleroma/admin/users/resend_confirmation_email` + +### Resend confirmation email + +- Params: + - `nicknames` +- Response: Array of user nicknames diff --git a/docs/administration/CLI_tasks/user.md b/docs/administration/CLI_tasks/user.md index cf120f2c9..96b2d9e6a 100644 --- a/docs/administration/CLI_tasks/user.md +++ b/docs/administration/CLI_tasks/user.md @@ -15,6 +15,11 @@ $PREFIX new <nickname> <email> [<options>] - `--admin`/`--no-admin` - whether the user should be an admin - `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions +## List local users +```sh +$PREFIX list +``` + ## Generate an invite link ```sh $PREFIX invite [<options>] |