From: lain Date: Mon, 26 Oct 2020 16:50:34 +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=04b7505c75afbaa1f785b2adaf0313e9b0935fab;p=akkoma Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior --- 04b7505c75afbaa1f785b2adaf0313e9b0935fab diff --cc CHANGELOG.md index bb4c6d383,afeaa930b..e7a60666e --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -9,7 -9,9 +9,10 @@@ 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. +- `[:activitypub, :blockers_visible]` config to control visibility of blockers. ### Changed @@@ -49,7 -47,7 +48,8 @@@ switched to a new configuration mechani - Add documented-but-missing chat pagination. - Allow sending out emails again. +- See your own post when addressing a user from a blocked domain. + - Allow sending chat messages to yourself ## Unreleased (Patch)