hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'issue/1276' into 'develop'"

Browse source 
This reverts merge request !1877
This commit is contained in:
lain 2020-04-14 16:32:22 +00:00
commit 4576520461
11 changed files with 51 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

17
docs/API/differences_in_mastoapi_responses.md
View file

@ -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.