diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:59:37 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:59:37 -0600 |
| commit | 4c59e9477a601b5fff4ac1ee1483e0594b35a306 (patch) | |
| tree | c4e11c2ffae8d870bdb56659c740e04a566a41b6 | |
| parent | e151dea2768d82a07316887e903f7d1bfc2d0963 (diff) | |
| parent | 0b843f25679a9aa891ae4e9ff8bc2d31ac9f407c (diff) | |
| download | pleroma-4c59e9477a601b5fff4ac1ee1483e0594b35a306.tar.gz | |
Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | docs/configuration/cheatsheet.md | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc555878..bce43a062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - User notification settings: Add `privacy_option` option. - Support for custom Elixir modules (such as MRF policies) - User settings: Add _This account is a_ option. +- A new users admin digest email - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`). <details> <summary>API Changes</summary> diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 30d673eba..14bd7b600 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -484,6 +484,10 @@ Email notifications settings. - `:logo` - a path to a custom logo. Set it to `nil` to use the default Pleroma logo. - `:styling` - a map with color settings for email templates. +### Pleroma.Emails.NewUsersDigestEmail + +- `:enabled` - a boolean, enables new users admin digest email when `true`. Defaults to `false`. + ## Background jobs ### Oban |