hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/1383

Browse source
This commit is contained in:
Maksim Pechnikov 2020-02-10 20:49:20 +03:00
commit 6813c0302c
79 changed files with 1053 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

26
config/description.exs
View file

@ -764,6 +764,15 @@ config :pleroma, :config_description, [
"Set to `true` to use extended local nicknames format (allows underscores/dashes)." <>
" This will break federation with older software for theses nicknames."
},
%{
key: :cleanup_attachments,
type: :boolean,
description: """
"Set to `true` to remove associated attachments when status is removed.
This will not affect duplicates and attachments without status.
Enabling this will increase load to database when deleting statuses on larger instances.
"""
},
%{
key: :max_pinned_statuses,
type: :integer,
@ -862,7 +871,7 @@ config :pleroma, :config_description, [
},
%{
key: :limit_to_local_content,
type: [:atom, false],
type: {:dropdown, :atom},
description:
"Limit unauthenticated users to search for local statutes and users only. Default: `:unauthenticated`.",
suggestions: [
@ -933,7 +942,7 @@ config :pleroma, :config_description, [
children: [
%{
key: :level,
type: :atom,
type: {:dropdown, :atom},
description: "Log level",
suggestions: [:debug, :info, :warn, :error]
},
@ -965,7 +974,7 @@ config :pleroma, :config_description, [
children: [
%{
key: :level,
type: :atom,
type: {:dropdown, :atom},
description: "Log level",
suggestions: [:debug, :info, :warn, :error]
},
@ -989,7 +998,7 @@ config :pleroma, :config_description, [
children: [
%{
key: :level,
type: :atom,
type: {:dropdown, :atom},
description: "Log level",
suggestions: [:debug, :info, :warn, :error]
},
@ -1960,7 +1969,7 @@ config :pleroma, :config_description, [
},
%{
key: :verbose,
type: [:atom, false],
type: {:dropdown, :atom},
description: "Logs verbose mode",
suggestions: [false, :error, :warn, :info, :debug]
},
@ -2169,12 +2178,7 @@ config :pleroma, :config_description, [
%{
key: :new_window,
type: :boolean,
description: "Set to `false` to remove target='_blank' attribute"
},
%{
key: :scheme,
type: :boolean,
description: "Set to `true` to link urls with schema http://google.com"
description: "Link urls will open in new window/tab"
},
%{
key: :truncate,