diff options
| author | lain <lain@soykaf.club> | 2021-01-17 13:11:28 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-17 13:11:28 +0000 |
| commit | 732cc0ce46e8044909dd5205858c43f75fe3e937 (patch) | |
| tree | ce2e47fc6a2c21683fb3ba1865fec43b853022df | |
| parent | 181060b59510f89c610ce45e71fd002b53d249c4 (diff) | |
| parent | cbb1174cbd8858079343d0852b7dba326b7dbb47 (diff) | |
| download | pleroma-732cc0ce46e8044909dd5205858c43f75fe3e937.tar.gz | |
Merge branch 'fix/changelog-entries' into 'develop'
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
See merge request pleroma/pleroma!3258
| -rw-r--r-- | CHANGELOG.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b24bf07..2b8e8d2f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute. - Admin API: An endpoint to manage frontends. - Streaming API: Add follow relationships updates. +- WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types </details> ### Fixed @@ -57,9 +58,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased (Patch) ### Fixed - -- Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention -- Emoji Reaction activity filtering from blocked and muted accounts. - StealEmojiPolicy creates dir for emojis, if it doesn't exist. ## [2.2.1] - 2020-12-22 @@ -76,6 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Rich Media Previews sometimes showed the wrong preview due to a bug following redirects. - Fixes for the autolinker. - Forwarded reports duplication from Pleroma instances. +- Emoji Reaction activity filtering from blocked and muted accounts. - <details> <summary>API</summary> |