diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-18 22:13:05 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-18 22:13:05 +0300 |
| commit | ed3bc53fa137ec4652606cad1df5783c47afb830 (patch) | |
| tree | ab05f72720d2118b6f22b159c80bf5de4961d7ce /CHANGELOG.md | |
| parent | 2159daa9af8967fe4b6d31e19c7048979b4cb165 (diff) | |
| parent | 6c052bd5b6cc29d321b500654bd6b098d0e6c56a (diff) | |
Merge branch 'develop' into issue/2099
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5abafdf69..e61b1d144 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Added +- Experimental websocket-based federation between Pleroma instances. + ### Changed - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated. @@ -13,6 +16,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Users with the `discoverable` field set to false will not show up in searches. - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). +### Added +- Media preview proxy (requires media proxy be enabled; see `:media_preview_proxy` config for more details). +- Pleroma API: Importing the mutes users from CSV files. + ### Removed - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation). @@ -21,8 +28,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Removed `:managed_config` option. In practice, it was accidentally removed with 2.0.0 release when frontends were switched to a new configuration mechanism, however it was not officially removed until now. -### Added -- Pleroma API: Importing the mutes users from CSV files. ## [2.1.2] - 2020-09-17 |