diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:10:02 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:10:02 +0300 |
| commit | 0cda80f266c03557b47112e52bfe748655b4321c (patch) | |
| tree | 3066cf037c65cd8a19aa0228cb75ec6acc94d870 /docs/API/differences_in_mastoapi_responses.md | |
| parent | 650853fc895fb2e21eac347e056eab98b842a3b7 (diff) | |
| parent | 6c3e09fbce823fe1ddef96a4a1ec54d67ceeec50 (diff) | |
| download | pleroma-0cda80f266c03557b47112e52bfe748655b4321c.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
Diffstat (limited to 'docs/API/differences_in_mastoapi_responses.md')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 0a7520f9e..1059155cf 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -185,15 +185,8 @@ Post here request with `grant_type=refresh_token` to obtain new access token. Re Has theses additional parameters (which are the same as in Pleroma-API): - `fullname`: optional - `bio`: optional - `captcha_solution`: optional, contains provider-specific captcha solution, - `captcha_token`: optional, contains provider-specific captcha token - `token`: invite token required when the registrations aren't public. - - -## Markers - -Has these additional fields under the `pleroma` object: - -- `unread_count`: contains number unread notifications +- `fullname`: optional +- `bio`: optional +- `captcha_solution`: optional, contains provider-specific captcha solution, +- `captcha_token`: optional, contains provider-specific captcha token +- `token`: invite token required when the registrations aren't public. |