pleroma

commit: a708bf4946736fb500520db8a9cdeed8d72b9d70
parent 29be5018b0a7a50708aad68f69f187184ceaa7b4
Author: vaartis <vaartis@kotobank.ch>
Date:   Fri, 20 Jun 2025 21:22:29 +0000

Merge branch 'add-tos-setting' into 'develop'

Add tos setting

See merge request pleroma/pleroma!4321
Diffstat:
A
changelog.d/tos-setting.add
1
+
M
config/config.exs
1
+
M
config/description.exs
7
+++++++

3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changelog.d/tos-setting.add b/changelog.d/tos-setting.add
@@ -0,0 +1 @@
+Allow Terms of Service panel behaviour to be configurable
diff --git a/config/config.exs b/config/config.exs
@@ -307,6 +307,7 @@ config :pleroma, :frontend_configurations,
     collapseMessageWithSubject: false,
     disableChat: false,
     greentext: false,
+    embeddedToS: true,
     hideFilteredStatuses: false,
     hideMutedPosts: false,
     hidePostStats: false,
diff --git a/config/description.exs b/config/description.exs
@@ -1261,6 +1261,7 @@ config :pleroma, :config_description, [
             background: "/static/aurora_borealis.jpg",
             collapseMessageWithSubject: false,
             greentext: false,
+            embeddedToS: true,
             hideFilteredStatuses: false,
             hideMutedPosts: false,
             hidePostStats: false,
@@ -1313,6 +1314,12 @@ config :pleroma, :config_description, [
             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,
             label: "Hide Filtered Statuses",
             type: :boolean,