diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-04 15:53:47 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 15:53:47 +0000 |
| commit | 75e415d5f4981c2deab324a9161a183d0a498e5b (patch) | |
| tree | 595e7ff48bff7f33b68e778e92f26016e4322592 | |
| parent | 99b312cbab7cd0a270b9987d2c21cf45a0a05077 (diff) | |
| parent | 31e57cd1b34798afb07a8de4c0c95ef3c15e22ed (diff) | |
Merge branch 'fix/extended-nickname-format-default-config' into 'develop'
Add missing extended_nickname_format setting to the default config
See merge request pleroma/pleroma!1776
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ebc46b7d..d2f945004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname` +- Added `:instance, extended_nickname_format` setting to the default config ## [1.1.0] - 2019-??-?? ### Security diff --git a/config/config.exs b/config/config.exs index 36bea19a0..ddbfb246a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -279,7 +279,8 @@ config :pleroma, :instance, max_remote_account_fields: 20, account_field_name_length: 512, account_field_value_length: 2048, - external_user_synchronization: true + external_user_synchronization: true, + extended_nickname_format: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |