diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-21 08:05:36 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-21 08:05:36 +0000 |
| commit | d0b1c498a0c294e99160c01e8e43d6891b1922bc (patch) | |
| tree | b760e1d7823b4d7d56868b65868b839f8ca44d3e | |
| parent | b7669c6efe689d40780c30a4feb0f06f8d1d1f2d (diff) | |
| parent | 90ad55b8ffc0743f2c3b01c264a52d8e128e5f61 (diff) | |
| download | pleroma-d0b1c498a0c294e99160c01e8e43d6891b1922bc.tar.gz | |
Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'
Resolve "Enable custom panel by default and have default content"
Closes #146
See merge request pleroma/pleroma!124
| -rw-r--r-- | priv/static/instance/panel.html | 3 | ||||
| -rw-r--r-- | priv/static/static/config.json | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html index ae9647837..7e73e4824 100644 --- a/priv/static/instance/panel.html +++ b/priv/static/instance/panel.html @@ -1,4 +1,5 @@ <div style="margin-left:12px; margin-right:12px"> -<p>This is a <a href="https://pleroma.social" target="_blank">Pleroma</a> instance.</p> +<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p> +<p><a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p> </div> diff --git a/priv/static/static/config.json b/priv/static/static/config.json index 9863ec024..797f03377 100644 --- a/priv/static/static/config.json +++ b/priv/static/static/config.json @@ -4,5 +4,5 @@ "logo": "/static/logo.png", "defaultPath": "/main/all", "chatDisabled": false, - "showInstanceSpecificPanel": false + "showInstanceSpecificPanel": true } |