diff options
author | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
commit | 6fb96f64c13597bcf8d10f30442ac61610cec58e (patch) | |
tree | 29db6b5d77a562dd496618ebcd54c15574f093a8 /docs | |
parent | 4dfc617cdf1c2579f4f941dcd0fa5c728178df06 (diff) | |
parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
download | pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
Diffstat (limited to 'docs')
-rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 15 | ||||
-rw-r--r-- | docs/clients.md | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 289f85930..c099eb1a0 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -202,4 +202,19 @@ 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 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/> |