diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
| commit | d75d0ae134e0a8de9504507f4c78567b9eedcc72 (patch) | |
| tree | b7be0da8e19018241cc22509863fefadabe8ff08 /docs | |
| parent | 494bb6bac64361860db194aed57618450a76177d (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-d75d0ae134e0a8de9504507f4c78567b9eedcc72.tar.gz | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/admin_api.md | 8 | ||||
| -rw-r--r-- | docs/config.md | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 0377ea655..9583883d3 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -310,6 +310,14 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret - Params: none - Response: password reset token (base64 string) +## `/api/pleroma/admin/users/:nickname/force_password_reset` + +### Force passord reset for a user with a given nickname + +- Methods: `PATCH` +- Params: none +- Response: none (code `204`) + ## `/api/pleroma/admin/reports` ### Get a list of reports - Method `GET` diff --git a/docs/config.md b/docs/config.md index 1179def56..ed119fd32 100644 --- a/docs/config.md +++ b/docs/config.md @@ -23,6 +23,7 @@ Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`. * `truncated_namespace`: If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or "" etc. For example, when using CDN to S3 virtual host format, set "". At this time, write CNAME to CDN in public_endpoint. +* `streaming_enabled`: Enable streaming uploads, when enabled the file will be sent to the server in chunks as it's being read. This may be unsupported by some providers, try disabling this if you have upload problems. ## Pleroma.Upload.Filter.Mogrify @@ -521,7 +522,7 @@ config :auto_linker, class: false, strip_prefix: false, new_window: false, - rel: false + rel: "ugc" ] ``` |