Merge branch 'feature/instance-specific-panel' into 'develop'

add instance specific panel See merge request pleroma/pleroma!66
2018-02-11 09:32:48 +00:00 · 2018-02-11 09:32:48 +00:00 · 1d52afe83e
commit 1d52afe83e
parent 0e2ca77eec 9cf293c84b
2 changed files with 6 additions and 1 deletions
--- a/priv/static/instance/panel.html
+++ b/priv/static/instance/panel.html
@ -0,0 +1,4 @@
+<div style="margin-left:12px; margin-right:12px">
+<p>This is a <a href="https://pleroma.social" target="_blank">Pleroma</a> instance.</p>
+</div>
+
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -3,5 +3,6 @@
  "background": "/static/bg.jpg",
  "logo": "/static/logo.png",
  "defaultPath": "/main/all",
-  "chatDisabled": false
+  "chatDisabled": false,
+  "showInstanceSpecificPanel": true
 }