diff options
| author | lain <lain@soykaf.club> | 2019-11-19 13:16:49 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-19 13:16:49 +0000 |
| commit | bf89e0bf38d9709f6dd331f5d9b326575994423d (patch) | |
| tree | 8d5fbb12d85a8cef9fb1ee8a111346861f4f6050 /CHANGELOG.md | |
| parent | 06151776c0c2c529a1bd3b4866162794c141e95f (diff) | |
| parent | 36686f52457454841c6b9c85a137eabeb1e739fc (diff) | |
| download | pleroma-bf89e0bf38d9709f6dd331f5d9b326575994423d.tar.gz pleroma-bf89e0bf38d9709f6dd331f5d9b326575994423d.zip | |
Merge branch 'feature/admin-api/support-token-header' into 'develop'
Admin API: Support authentication via `x-admin-token` HTTP header
Closes #1430
See merge request pleroma/pleroma!1993
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9b97f0b..00fc00ca8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Admin API: Return `total` when querying for reports - Mastodon API: Return `pleroma.direct_conversation_id` when creating a direct message (`POST /api/v1/statuses`) - Admin API: Return link alongside with token on password reset +- Admin API: Support authentication via `x-admin-token` HTTP header - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`) - Mastodon API: `pleroma.thread_muted` to the Status entity - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message |