Merge branch 'chore/update-config-fe' into 'develop'

Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560

2 files changed, 29 insertions, 9 deletions

diff --git a/config/config.exs b/config/config.exs
index 248cf2455..1b11b4fa9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -272,20 +272,33 @@ config :pleroma, :markup,
 
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
-    theme: "pleroma-dark",
-    logo: "/static/logo.png",
-    background: "/images/city.jpg",
-    redirectRootNoLogin: "/main/all",
-    redirectRootLogin: "/main/friends",
-    showInstanceSpecificPanel: true,
-    scopeOptionsEnabled: false,
-    formattingOptionsEnabled: false,
+    alwaysShowSubjectInput: true,
+    background: "/static/aurora_borealis.jpg",
     collapseMessageWithSubject: false,
+    disableChat: false,
+    greentext: false,
+    hideFilteredStatuses: false,
+    hideMutedPosts: false,
     hidePostStats: false,
+    hideSitename: false,
     hideUserStats: false,
+    loginMethod: "password",
+    logo: "/static/logo.png",
+    logoMargin: ".1em",
+    logoMask: true,
+    minimalScopesMode: false,
+    noAttachmentLinks: false,
+    nsfwCensorImage: "",
+    postContentType: "text/plain",
+    redirectRootLogin: "/main/friends",
+    redirectRootNoLogin: "/main/all",
     scopeCopy: true,
+    sidebarRight: false,
+    showFeaturesPanel: true,
+    showInstanceSpecificPanel: false,
     subjectLineBehavior: "email",
-    alwaysShowSubjectInput: true
+    theme: "pleroma-dark",
+    webPushNotifications: false
   },
   masto_fe: %{
     showInstanceSpecificPanel: true
diff --git a/config/description.exs b/config/description.exs
index 324cae8cf..716bcf4ff 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1117,6 +1117,7 @@ config :pleroma, :config_description, [
             redirectRootLogin: "/main/friends",
             redirectRootNoLogin: "/main/all",
             scopeCopy: true,
+            sidebarRight: false,
             showFeaturesPanel: true,
             showInstanceSpecificPanel: false,
             subjectLineBehavior: "email",
@@ -1257,6 +1258,12 @@ config :pleroma, :config_description, [
             description: "Copy the scope (private/unlisted/public) in replies to posts by default"
           },
           %{
+            key: :sidebarRight,
+            label: "Sidebar on Right",
+            type: :boolean,
+            description: "Change alignment of sidebar and panels to the right."
+          },
+          %{
             key: :showFeaturesPanel,
             label: "Show instance features panel",
             type: :boolean,