diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-01 11:46:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-01 11:46:07 +0000 |
| commit | 79c88a257f8e33bf55ce6b18c32a791d6bf9546d (patch) | |
| tree | e28fd62d908fff9b29fd5325060bfda9a46cd312 | |
| parent | 3b05f834f4987fea4c7a48045105a24e6b1765a4 (diff) | |
| parent | 0b3561ae72ea1686f940366e41d6bd1a2262d665 (diff) | |
| download | pleroma-79c88a257f8e33bf55ce6b18c32a791d6bf9546d.tar.gz pleroma-79c88a257f8e33bf55ce6b18c32a791d6bf9546d.zip | |
Merge branch 'fix/changelog' into 'develop'
Move changelog entries
See merge request pleroma/pleroma!1368
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ae7e4c0ed..8a0dad453 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`) - Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses) +- Admin API: Return users' tags when querying reports +- Admin API: Return avatar and display name when querying users ### Fixed - Not being able to pin unlisted posts @@ -56,8 +58,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Admin API: Endpoints for managing reports - Admin API: Endpoints for deleting and changing the scope of individual reported statuses - Admin API: Endpoints to view and change config settings. -- Admin API: Return users' tags when querying reports -- Admin API: Return avatar and display name when querying users - AdminFE: initial release with basic user management accessible at /pleroma/admin/ - Mastodon API: Add chat token to `verify_credentials` response - Mastodon API: Add background image setting to `update_credentials` |