diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-19 23:27:13 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-19 23:27:13 +0700 |
| commit | 73407f4eea7793c93981a87bb7eddef4f8daab7c (patch) | |
| tree | 31dd745ec9cd8adf57bde7f3e6a2ffd9be3289ae /docs | |
| parent | bc7862106d9881f858a58319e9e4b44cba1bcf01 (diff) | |
| parent | cc93775ebf539598075c0b9afb96c60c8bede6b5 (diff) | |
| download | pleroma-73407f4eea7793c93981a87bb7eddef4f8daab7c.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/differences_in_mastoapi_responses.md | 6 | ||||
| -rw-r--r-- | docs/config.md | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 923d94db2..ed3fd9b67 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -41,6 +41,12 @@ Has these additional fields under the `pleroma` object: - `is_admin`: boolean, true if user is an admin - `confirmation_pending`: boolean, true if a new user account is waiting on email confirmation to be activated +## Account Search + +Behavior has changed: + +- `/api/v1/accounts/search`: Does not require authentication + ## Notifications Has these additional fields under the `pleroma` object: diff --git a/docs/config.md b/docs/config.md index d618c5dde..5a97033b2 100644 --- a/docs/config.md +++ b/docs/config.md @@ -343,9 +343,10 @@ This config contains two queues: `federator_incoming` and `federator_outgoing`. * `max_retries`: The maximum number of times a federation job is retried ## Pleroma.Web.Metadata -* `providers`: a list of metadata providers to enable. Providers availible: +* `providers`: a list of metadata providers to enable. Providers available: * Pleroma.Web.Metadata.Providers.OpenGraph * Pleroma.Web.Metadata.Providers.TwitterCard + * Pleroma.Web.Metadata.Providers.RelMe - add links from user bio with rel=me into the `<header>` as `<link rel=me>` * `unfurl_nsfw`: If set to `true` nsfw attachments will be shown in previews ## :rich_media |