From: feld <feld@feld.me>
Date: Mon, 8 Feb 2021 22:01:32 +0000 (+0000)
Subject: Merge branch 'develop' into 'new-user-emails'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=593c0851d9a62977f5a6abd22df991b0d73da657;hp=-c;p=akkoma

Merge branch 'develop' into 'new-user-emails'
---

593c0851d9a62977f5a6abd22df991b0d73da657
diff --combined CHANGELOG.md
index c1e490c30,e89836b7a..8635ed4e7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,6 -19,8 +19,8 @@@ The format is based on [Keep a Changelo
  - Improved Apache webserver support: updated sample configuration, MediaProxy cache invalidation verified with the included sample script
  - Improve OAuth 2.0 provider support. A missing `fqn` field was added to the response, but does not expose the user's email address.
  - Provide redirect of external posts from `/notice/:id` to their original URL
+ - Admins no longer receive notifications for reports if they are the actor making the report.
+ - Improved Mailer configuration setting descriptions for AdminFE.
  
  <details>
    <summary>API Changes</summary>
@@@ -49,8 -51,8 +51,10 @@@
  - Ability to set ActivityPub aliases for follower migration.
  - Configurable background job limits for RichMedia (link previews) and MediaProxyWarmingPolicy
  - Ability to define custom HTTP headers per each frontend
+ - MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
+ 
 +- New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
 +
  <details>
    <summary>API Changes</summary>
  - Admin API: (`GET /api/pleroma/admin/users`) filter users by `unconfirmed` status and `actor_type`.