diff options
| author | lain <lain@soykaf.club> | 2020-05-20 14:02:40 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-20 14:02:40 +0200 |
| commit | c7cdc553ff9bd7a068274d9b4b71008d9df04723 (patch) | |
| tree | 7b66d6b01ea9d0e82ec2b594e4549397230ce145 /docs/API | |
| parent | 0d5bce018df9c99c771daaaa1de3ab0efc0cba5c (diff) | |
| parent | 423ea497bb2a7225f4f0d0e1ebff93466b3ec124 (diff) | |
| download | pleroma-c7cdc553ff9bd7a068274d9b4b71008d9df04723.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
Diffstat (limited to 'docs/API')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 1 | ||||
| -rw-r--r-- | docs/API/pleroma_api.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 6d37d9008..e65fd5da4 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -216,6 +216,7 @@ Has theses additional parameters (which are the same as in Pleroma-API): - `avatar_upload_limit`: The same for avatars - `background_upload_limit`: The same for backgrounds - `banner_upload_limit`: The same for banners +- `background_image`: A background image that frontends can use - `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/API/pleroma_api.md b/docs/API/pleroma_api.md index 5895613a3..867f59919 100644 --- a/docs/API/pleroma_api.md +++ b/docs/API/pleroma_api.md @@ -265,7 +265,7 @@ See [Admin-API](admin_api.md) * Method `PUT` * Authentication: required * Params: - * `image`: Multipart image + * `file`: Multipart image * Response: JSON. Returns a mastodon media attachment entity when successful, otherwise returns HTTP 415 `{"error": "error_msg"}` * Example response: |