Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (63 commits) Fix email mix task on OTP releases Actually fix upload limit on OTP releases Questions: Add timezone to `closed` property deps: update plug to 1.9 Add User.get_follow_state/2 fix EmojiReactions: Rename to EmojiReacts Update FE bundle Update CHANGELOG Cancellation of a follow request for a remote user Simplify in-database config docs description change dropdown type removing confusing error Apply suggestion to CHANGELOG.md removing migrate_from_db endpoint from admin api Remove AutoLinker `scheme` option from the config Add support for cancellation of a follow request Add cheatsheet entry fix not being able to pin polls ...
This commit is contained in:
commit
192426b485
122 changed files with 5228 additions and 460 deletions
|
|
@ -273,7 +273,8 @@ config :pleroma, :instance,
|
|||
account_field_name_length: 512,
|
||||
account_field_value_length: 2048,
|
||||
external_user_synchronization: true,
|
||||
extended_nickname_format: true
|
||||
extended_nickname_format: true,
|
||||
cleanup_attachments: false
|
||||
|
||||
config :pleroma, :feed,
|
||||
post_title: %{
|
||||
|
|
@ -521,7 +522,6 @@ config :pleroma, :fetch_initial_posts,
|
|||
|
||||
config :auto_linker,
|
||||
opts: [
|
||||
scheme: true,
|
||||
extra: true,
|
||||
# TODO: Set to :no_scheme when it works properly
|
||||
validate_tld: true,
|
||||
|
|
@ -609,11 +609,21 @@ config :pleroma, :env, Mix.env()
|
|||
config :http_signatures,
|
||||
adapter: Pleroma.Signature
|
||||
|
||||
config :pleroma, :rate_limit, authentication: {60_000, 15}
|
||||
config :pleroma, :rate_limit,
|
||||
authentication: {60_000, 15},
|
||||
search: [{1000, 10}, {1000, 30}],
|
||||
app_account_creation: {1_800_000, 25},
|
||||
relations_actions: {10_000, 10},
|
||||
relation_id_action: {60_000, 2},
|
||||
statuses_actions: {10_000, 15},
|
||||
status_id_action: {60_000, 3},
|
||||
password_reset: {1_800_000, 5},
|
||||
account_confirmation_resend: {8_640_000, 5},
|
||||
ap_routes: {60_000, 15}
|
||||
|
||||
config :pleroma, Pleroma.ActivityExpiration, enabled: true
|
||||
|
||||
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
|
||||
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
|
||||
|
||||
config :pleroma, :static_fe, enabled: false
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue