diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-14 08:47:10 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-14 08:47:10 +0000 |
| commit | 6085c71bd17e2b676e0820bf3fd93f81a1902ac3 (patch) | |
| tree | a92e6aaa3fd96150d54d04309558c7cd5cae7416 /CHANGELOG.md | |
| parent | f74bb1d0fc123ba8616d81a80dcf5d64b25aa4ed (diff) | |
| parent | 7a322713c33e8ef2fdc326f9e35d1fcbe7590c93 (diff) | |
| download | pleroma-6085c71bd17e2b676e0820bf3fd93f81a1902ac3.tar.gz pleroma-6085c71bd17e2b676e0820bf3fd93f81a1902ac3.zip | |
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
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 945e7dc4d..e04b96281 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity - OAuth: support for hierarchical permissions / [Mastodon 2.4.3 OAuth permissions](https://docs.joinmastodon.org/api/permissions/) - Metadata Link: Atom syndication Feed +- Mix task to re-count statuses for all users (`mix pleroma.count_statuses`) - Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints - Admin API: `/users/:nickname/toggle_activation` endpoint is now deprecated in favor of: `/users/activate`, `/users/deactivate`, both accept `nicknames` array - 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). @@ -61,6 +62,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Add `/api/v1/markers` for managing timeline read markers - Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` - Configuration: `feed` option for user atom feed. +- Pleroma API: Add Emoji reactions </details> ### Fixed |