diff options
| author | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
| commit | 31e57cd1b34798afb07a8de4c0c95ef3c15e22ed (patch) | |
| tree | 461d3d50b855d080eb17f0946213168a87ac7625 /CHANGELOG.md | |
| parent | b8b98ac40f042a8c3d2562edc095f0e1a309760f (diff) | |
| parent | 27110793a7d8e3aa6434bde63a1f687424ae779c (diff) | |
| download | pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.tar.gz pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.zip | |
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c22995b82..d2f945004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added - Refreshing poll results for remote polls +- Job queue stats to the healthcheck page - Admin API: Add ability to require password reset - Mastodon API: Account entities now include `follow_requests_count` (planned Mastodon 3.x addition) - Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items @@ -23,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) +- Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname` - Added `:instance, extended_nickname_format` setting to the default config ## [1.1.0] - 2019-??-?? |