diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:10:02 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:10:02 +0300 |
| commit | 0cda80f266c03557b47112e52bfe748655b4321c (patch) | |
| tree | 3066cf037c65cd8a19aa0228cb75ec6acc94d870 /CHANGELOG.md | |
| parent | 650853fc895fb2e21eac347e056eab98b842a3b7 (diff) | |
| parent | 6c3e09fbce823fe1ddef96a4a1ec54d67ceeec50 (diff) | |
| download | pleroma-0cda80f266c03557b47112e52bfe748655b4321c.tar.gz pleroma-0cda80f266c03557b47112e52bfe748655b4321c.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2afe26510..080d44063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Filtering of push notifications on activities from blocked domains ## [unreleased-patch] +### Fixed +- Logger configuration through AdminFE ## [2.0.2] - 2020-04-08 ### Added @@ -122,7 +124,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: `pleroma.thread_muted` to the Status entity - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message - Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload. -- Mastodon API: Add `pleroma.unread_count` to the Marker entity - Admin API: Render whole status in grouped reports - Mastodon API: User timelines will now respect blocks, unless you are getting the user timeline of somebody you blocked (which would be empty otherwise). - Mastodon API: Favoriting / Repeating a post multiple times will now return the identical response every time. Before, executing that action twice would return an error ("already favorited") on the second try. |