diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
| commit | 6ba9055b51a454baaf063943e72a39006f7e5fad (patch) | |
| tree | ca54523b21a7fe5a5ef0c99b2032fc0f899d40a8 /docs | |
| parent | 9ce928d8238877f870e099cb2fe010d322717856 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/differences_in_mastoapi_responses.md | 1 | ||||
| -rw-r--r-- | docs/config.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 27463f8f3..fd23fe2d2 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -83,6 +83,7 @@ Additional parameters can be added to the JSON body/Form data: - `show_role` - if true, user's role (e.g admin, moderator) will be exposed to anyone in the API - `default_scope` - the scope returned under `privacy` key in Source subentity - `pleroma_settings_store` - Opaque user settings to be saved on the backend. +- `skip_thread_containment` - if true, skip filtering out broken threads ### Pleroma Settings Store Pleroma has mechanism that allows frontends to save blobs of json for each user on the backend. This can be used to save frontend-specific settings for a user that the backend does not need to know about. diff --git a/docs/config.md b/docs/config.md index 718a7912a..f4a1868fd 100644 --- a/docs/config.md +++ b/docs/config.md @@ -111,6 +111,7 @@ config :pleroma, Pleroma.Emails.Mailer, * `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). (Default: `false`) * `healthcheck`: if set to true, system data will be shown on ``/api/pleroma/healthcheck``. * `remote_post_retention_days`: the default amount of days to retain remote posts when pruning the database +* `skip_thread_containment`: Skip filter out broken threads. the default is `false`. ## :app_account_creation REST API for creating an account settings |