From: lain Date: Fri, 13 Nov 2020 13:35:47 +0000 (+0000) Subject: Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=0d149502fe8397df6f374b44f1b0087d05cadecb;hp=-c;p=akkoma 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 --- 0d149502fe8397df6f374b44f1b0087d05cadecb diff --combined CHANGELOG.md index b619bd891,c963972c8..2ecb43483 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -10,6 -10,7 +10,7 @@@ The format is based on [Keep a Changelo - 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 @@@ -17,7 -18,6 +18,7 @@@ - Account backup - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance. - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media` +- The site title is now injected as a `title` tag like preloads or metadata. ### Changed @@@ -33,7 -33,6 +34,7 @@@ - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). - Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`. - Polls now always return a `voters_count`, even if they are single-choice +- Admin Emails: The ap id is used as the user link in emails now.
API Changes