From: lain <lain@soykaf.club>
Date: Wed, 4 Nov 2020 14:05:01 +0000 (+0100)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=329aa19c9f1175f915441c84689860155949bb08;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
---

329aa19c9f1175f915441c84689860155949bb08
diff --cc CHANGELOG.md
index 0eeffb72f,2ee17d239..8358eb9da
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,13 +9,14 @@@ The format is based on [Keep a Changelo
  - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
  - 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).
+ - Pleroma API: Importing the mutes users from CSV files.
+ - Experimental websocket-based federation between Pleroma instances.
+ - Support pagination of blocks and mutes
+ - App metrics: ability to restrict access to specified IP whitelist.
+ - 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`
  
  ### Changed