diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-23 17:22:42 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-23 17:22:42 +0300 |
| commit | 8cc809e44e3a899f93061c4c5f68d9736d79d79e (patch) | |
| tree | 8193991e2a2b705a60d847a626d22abaf756d7f1 /CHANGELOG.md | |
| parent | 11cd9944258bfc2123b821b21321e12097d0f19b (diff) | |
| parent | 54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff) | |
| download | pleroma-8cc809e44e3a899f93061c4c5f68d9736d79d79e.tar.gz pleroma-8cc809e44e3a899f93061c4c5f68d9736d79d79e.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
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 cf16cf5df..51e5424c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Admin API: `POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group` are deprecated in favor of: `POST/DELETE /api/pleroma/admin/users/permission_group/:permission_group` (both accept `nicknames` array), `DELETE /api/pleroma/admin/users` (`nickname` query param or `nickname` sent in JSON body) is deprecated in favor of: `DELETE /api/pleroma/admin/users` (`nicknames` query array param or `nicknames` sent in JSON body). - Admin API: Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays - Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all conversations as read +- Mastodon API: Add `/api/v1/markers` for managing timeline read markers ### Changed - **Breaking:** Elixir >=1.8 is now required (was >= 1.7) |