summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-13 13:35:47 +0000
committerlain <lain@soykaf.club>2020-11-13 13:35:47 +0000
commit0d149502fe8397df6f374b44f1b0087d05cadecb (patch)
tree5a62aaf428f725e9af73542ca970d7ba4bf342a1 /CHANGELOG.md
parent0597571fcac7a7e180b67797868a4ffa0f8a4f0b (diff)
parent70e4b86250da9ef97a836f497510c36bf22fa905 (diff)
downloadpleroma-0d149502fe8397df6f374b44f1b0087d05cadecb.tar.gz
pleroma-0d149502fe8397df6f374b44f1b0087d05cadecb.zip
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b619bd891..2ecb43483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
- Mix task option for force-unfollowing relays
- Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
+- Reports now generate notifications for admins and mods.
- Pleroma API: Importing the mutes users from CSV files.
- Experimental websocket-based federation between Pleroma instances.
- Support pagination of blocks and mutes