Merge branch 'add-tos-setting' into 'develop'
Add tos setting See merge request pleroma/pleroma!4321
This commit is contained in:
commit
a708bf4946
3 changed files with 9 additions and 0 deletions
1
changelog.d/tos-setting.add
Normal file
1
changelog.d/tos-setting.add
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Allow Terms of Service panel behaviour to be configurable
|
||||||
|
|
@ -307,6 +307,7 @@ config :pleroma, :frontend_configurations,
|
||||||
collapseMessageWithSubject: false,
|
collapseMessageWithSubject: false,
|
||||||
disableChat: false,
|
disableChat: false,
|
||||||
greentext: false,
|
greentext: false,
|
||||||
|
embeddedToS: true,
|
||||||
hideFilteredStatuses: false,
|
hideFilteredStatuses: false,
|
||||||
hideMutedPosts: false,
|
hideMutedPosts: false,
|
||||||
hidePostStats: false,
|
hidePostStats: false,
|
||||||
|
|
|
||||||
|
|
@ -1261,6 +1261,7 @@ config :pleroma, :config_description, [
|
||||||
background: "/static/aurora_borealis.jpg",
|
background: "/static/aurora_borealis.jpg",
|
||||||
collapseMessageWithSubject: false,
|
collapseMessageWithSubject: false,
|
||||||
greentext: false,
|
greentext: false,
|
||||||
|
embeddedToS: true,
|
||||||
hideFilteredStatuses: false,
|
hideFilteredStatuses: false,
|
||||||
hideMutedPosts: false,
|
hideMutedPosts: false,
|
||||||
hidePostStats: false,
|
hidePostStats: false,
|
||||||
|
|
@ -1312,6 +1313,12 @@ config :pleroma, :config_description, [
|
||||||
type: :boolean,
|
type: :boolean,
|
||||||
description: "Enables green text on lines prefixed with the > character"
|
description: "Enables green text on lines prefixed with the > character"
|
||||||
},
|
},
|
||||||
|
%{
|
||||||
|
key: :embeddedToS,
|
||||||
|
label: "Embedded ToS panel",
|
||||||
|
type: :boolean,
|
||||||
|
description: "Hide Terms of Service panel decorations on About and Registration pages"
|
||||||
|
},
|
||||||
%{
|
%{
|
||||||
key: :hideFilteredStatuses,
|
key: :hideFilteredStatuses,
|
||||||
label: "Hide Filtered Statuses",
|
label: "Hide Filtered Statuses",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue