diff options
| author | lain <lain@soykaf.club> | 2019-02-01 10:21:17 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-02-01 10:21:17 +0100 |
| commit | 01d483f9c76456ed03010f5a0f5e08e118db27a8 (patch) | |
| tree | f3d0ca4e15c951d38e44e85befd366f1a8eca0f9 /docs | |
| parent | b19b4f85376f6bad33bb37b1624f45dbd502bfda (diff) | |
| parent | b3b0855456a92351667a50c8ea77f328bded76ca (diff) | |
| download | pleroma-01d483f9c76456ed03010f5a0f5e08e118db27a8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Pleroma-API.md | 1 | ||||
| -rw-r--r-- | docs/config.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/Pleroma-API.md b/docs/Pleroma-API.md index 3ebea565c..e1448d3f0 100644 --- a/docs/Pleroma-API.md +++ b/docs/Pleroma-API.md @@ -52,6 +52,7 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi * `confirm` * `captcha_solution`: optional, contains provider-specific captcha solution, * `captcha_token`: optional, contains provider-specific captcha token + * `token`: invite token required when the registerations aren't public. * Response: JSON. Returns a user object on success, otherwise returns `{"error": "error_msg"}` * Example response: ``` diff --git a/docs/config.md b/docs/config.md index 22a9b23f9..c14746d93 100644 --- a/docs/config.md +++ b/docs/config.md @@ -72,6 +72,7 @@ config :pleroma, Pleroma.Mailer, * `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`). * `account_activation_required`: Require users to confirm their emails before signing in. * `federating`: Enable federation with other instances +* `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it. * `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance * `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default: * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesn’t modify activities (default) |