sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 23:05:06 +01:00
Code Issues Releases Wiki Activity

Merge branch 'update/pleroma-fe-config-20180831' into 'develop'

Browse Source 
config: chase pleroma-fe updates from MR pleroma-fe!324.

See merge request pleroma/pleroma!310
This commit is contained in:
kaniini 2018-08-31 04:06:18 +00:00
commit d40466c291
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.exs
View File

@ -73,6 +73,8 @@ config :pleroma, :instance,
config :pleroma, :fe,
theme: "pleroma-dark",
logo: "/static/logo.png",
logo_mask: true,
logo_margin: "0.1em",
background: "/static/aurora_borealis.jpg",
redirect_root_no_login: "/main/all",
redirect_root_login: "/main/friends",

2
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -168,6 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
theme: Keyword.get(@instance_fe, :theme),
background: Keyword.get(@instance_fe, :background),
logo: Keyword.get(@instance_fe, :logo),
logoMask: Keyword.get(@instance_fe, :logo_mask),
logoMargin: Keyword.get(@instance_fe, :logo_margin),
redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
chatDisabled: !Keyword.get(@instance_chat, :enabled),