diff options
author | kaniini <nenolod@gmail.com> | 2019-01-29 13:54:10 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-29 13:54:10 +0000 |
commit | d03a116654bd7c4329b698a0f175e37aea8c2caa (patch) | |
tree | b5ea94fb5a001d3b2d3858921c480f8f58fb077b /config/config.exs | |
parent | ebb3496386c1e195b48bcdc9d72c4c30e60fe340 (diff) | |
parent | f53d464db0194eb66557b00c7d92b9df8c798ada (diff) | |
download | pleroma-d03a116654bd7c4329b698a0f175e37aea8c2caa.tar.gz pleroma-d03a116654bd7c4329b698a0f175e37aea8c2caa.zip |
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index e8cf2ed3a..1180a50bc 100644 --- a/config/config.exs +++ b/config/config.exs @@ -154,6 +154,7 @@ config :pleroma, :markup, Pleroma.HTML.Scrubber.Default ] +# Deprecated, will be gone in 1.0 config :pleroma, :fe, theme: "pleroma-dark", logo: "/static/logo.png", @@ -172,6 +173,24 @@ config :pleroma, :fe, subject_line_behavior: "email", always_show_subject_input: true +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, + collapseMessageWithSubject: false, + hidePostStats: false, + hideUserStats: false, + scopeCopy: true, + subjectLineBehavior: "email", + alwaysShowSubjectInput: true + } + config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, |