Browse Source

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
object-id-column
kaniini 4 years ago
parent
commit
75e415d5f4
2 changed files with 3 additions and 1 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +2
    -1
      config/config.exs

+ 1
- 0
CHANGELOG.md View File

@@ -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


+ 2
- 1
config/config.exs View File

@@ -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


Loading…
Cancel
Save