From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 7 Aug 2020 21:35:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/develop' into aliases
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1a5a7ba6e8a936d3138ca530d3466111e542aef6;p=akkoma

Merge remote-tracking branch 'upstream/develop' into aliases
---

1a5a7ba6e8a936d3138ca530d3466111e542aef6
diff --cc CHANGELOG.md
index ef3235804,a8e80eb3c..71c2c0317
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -63,7 -71,9 +71,10 @@@ The format is based on [Keep a Changelo
  - Support pagination in emoji packs API (for packs and for files in pack)
  - Support for viewing instances favicons next to posts and accounts
  - Added Pleroma.Upload.Filter.Exiftool as an alternate EXIF stripping mechanism targeting GPS/location metadata.
 +- Ability to set ActivityPub aliases for follower migration.
+ - "By approval" registrations mode.
+ - Configuration: Added `:welcome` settings for the welcome message to newly registered users. You can send a welcome message as a direct message, chat or email.
+ - Ability to hide favourites and emoji reactions in the API with `[:instance, :show_reactions]` config.
  
  <details>
    <summary>API Changes</summary>