diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-04 06:08:49 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-04 06:08:49 +0300 |
| commit | fe7a0d660e357a03558be3a95ddbb8b409ef9a9e (patch) | |
| tree | 88078f00a739ce5ed11132a8ef7130b8c8ca9664 /docs | |
| parent | a92c713d9c761563c72d0f660574878aa569249a (diff) | |
| parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
| download | pleroma-fe7a0d660e357a03558be3a95ddbb8b409ef9a9e.tar.gz pleroma-fe7a0d660e357a03558be3a95ddbb8b409ef9a9e.zip | |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 14 | ||||
| -rw-r--r-- | docs/clients.md | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index a62719c5d..8d1da936f 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -202,8 +202,22 @@ Has theses additional parameters (which are the same as in Pleroma-API): - `bio`: optional - `captcha_solution`: optional, contains provider-specific captcha solution, - `captcha_token`: optional, contains provider-specific captcha token +- `captcha_answer_data`: optional, contains provider-specific captcha data - `token`: invite token required when the registrations aren't public. +## Instance + +`GET /api/v1/instance` has additional fields + +- `max_toot_chars`: The maximum characters per post +- `poll_limits`: The limits of polls +- `upload_limit`: The maximum upload file size +- `avatar_upload_limit`: The same for avatars +- `background_upload_limit`: The same for backgrounds +- `banner_upload_limit`: The same for banners +- `pleroma.metadata.features`: A list of supported features +- `pleroma.metadata.federation`: The federation restrictions of this instance +- `vapid_public_key`: The public key needed for push messages ## Markers diff --git a/docs/clients.md b/docs/clients.md index 1eae0f0c6..7f98dc7b1 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -49,11 +49,11 @@ Feel free to contact us to be added to this list! - Platforms: Android - Features: Streaming Ready -### Roma -- Homepage: <https://www.pleroma.com/#mobileApps> -- Source Code: [iOS](https://github.com/roma-apps/roma-ios), [Android](https://github.com/roma-apps/roma-android) +### Fedi +- Homepage: <https://www.fediapp.com/> +- Source Code: Proprietary, but free - Platforms: iOS, Android -- Features: No Streaming +- Features: Pleroma-specific features like Reactions ### Tusky - Homepage: <https://tuskyapp.github.io/> |