summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-09-18 18:38:20 +0000
committerfeld <feld@feld.me>2020-09-18 18:38:20 +0000
commit6c052bd5b6cc29d321b500654bd6b098d0e6c56a (patch)
tree9357c0e0f653f8e35d63e32eb0faf090e600a816 /CHANGELOG.md
parent91ddd47e513c5fc343ffa9bea069801b0142a115 (diff)
parenta42880040574701000470fc1c2dbd6f7242c1a06 (diff)
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy See merge request pleroma/pleroma!3001
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e4d06c82..5a7e27fd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
- 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).
+
### Removed
- **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation).