diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
| commit | f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1 (patch) | |
| tree | 7542dbbe178183e4dd3c3451aa7744f18117fa37 /docs/api | |
| parent | 03471151d6089e318abaf5265d42ffedf7a5b902 (diff) | |
| parent | 1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff) | |
| download | pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.tar.gz | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/admin_api.md | 2 | ||||
| -rw-r--r-- | docs/api/differences_in_mastoapi_responses.md | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 98968c1a6..ca9303227 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -577,6 +577,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ## `/api/pleroma/admin/config` ### List config settings +List config settings only works with `:pleroma => :instance => :dynamic_configuration` setting to `true`. - Method `GET` - Params: none - Response: @@ -595,6 +596,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ## `/api/pleroma/admin/config` ### Update config settings +Updating config settings only works with `:pleroma => :instance => :dynamic_configuration` setting to `true`. Module name can be passed as string, which starts with `Pleroma`, e.g. `"Pleroma.Upload"`. Atom keys and values can be passed with `:` in the beginning, e.g. `":upload"`. Tuples can be passed as `{"tuple": ["first_val", Pleroma.Module, []]}`. diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index c65b11872..1907d70c8 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -34,7 +34,10 @@ Has these additional fields under the `pleroma` object: ## Accounts -- `/api/v1/accounts/:id`: The `id` parameter can also be the `nickname` of the user. This only works in this endpoint, not the deeper nested ones for following etc. +The `id` parameter can also be the `nickname` of the user. This only works in these endpoints, not the deeper nested ones for following etc. + +- `/api/v1/accounts/:id` +- `/api/v1/accounts/:id/statuses` Has these additional fields under the `pleroma` object: |