summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-08 14:38:33 +0000
committerlain <lain@soykaf.club>2019-08-08 14:38:33 +0000
commit29807ef6a5b43a528ffca08b4f721b251f331c8d (patch)
tree76930c3a3dc12b95bcb57a9b4832f861dd68d960 /CHANGELOG.md
parentb18234e04c76daa564e0d8157dcd09566485da24 (diff)
parent9d4f34fbcb1a8e2eca424b3a3374c9f9af972574 (diff)
downloadpleroma-29807ef6a5b43a528ffca08b4f721b251f331c8d.tar.gz
pleroma-29807ef6a5b43a528ffca08b4f721b251f331c8d.zip
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email See merge request pleroma/pleroma!1078
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 069974e44..dccc36965 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,6 +93,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Rich media: Do not crawl private IP ranges
### Added
+- Digest email for inactive users
- Add a generic settings store for frontends / clients to use.
- Explicit addressing option for posting.
- Optional SSH access mode. (Needs `erlang-ssh` package on some distributions).
@@ -119,6 +120,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Configuration: `notify_email` option
- Configuration: Media proxy `whitelist` option
- Configuration: `report_uri` option
+- Configuration: `email_notifications` option
- Configuration: `limit_to_local_content` option
- Pleroma API: User subscriptions
- Pleroma API: Healthcheck endpoint