diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-02-11 09:32:48 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-02-11 09:32:48 +0000 |
| commit | 1d52afe83e55285973559f8780c0ad7b70c2011d (patch) | |
| tree | 439d1a1caf2e52eada918d1057eec7fed83b0c7b | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| parent | 9cf293c84b68a5befa70f221fb49b4227e05dd51 (diff) | |
| download | pleroma-1d52afe83e55285973559f8780c0ad7b70c2011d.tar.gz | |
Merge branch 'feature/instance-specific-panel' into 'develop'
add instance specific panel
See merge request pleroma/pleroma!66
| -rw-r--r-- | priv/static/instance/panel.html | 4 | ||||
| -rw-r--r-- | priv/static/static/config.json | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html new file mode 100644 index 000000000..ae9647837 --- /dev/null +++ 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> + diff --git a/priv/static/static/config.json b/priv/static/static/config.json index 8e4b21cad..50bf888af 100644 --- 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 } |