Merge branch 'update/pleroma-fe-20180909' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!335
2018-09-09 12:15:14 +00:00 · 2018-09-09 12:15:14 +00:00 · f55ffc7893
commit f55ffc7893
parent b564c23d92 e5546c282f
18 changed files with 5 additions and 4 deletions
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f70689e27c09390170e6.js></script><script type=text/javascript src=/static/js/vendor.5cb6d04a9de200fd9af1.js></script><script type=text/javascript src=/static/js/app.6e2e9ee92450f3681b96.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.a83a8ba1f1f30d64bc53.js></script><script type=text/javascript src=/static/js/vendor.117ce7369a023987d44a.js></script><script type=text/javascript src=/static/js/app.8b645dcc4822f7e06077.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -9,5 +9,6 @@
  "chatDisabled": false,
  "showInstanceSpecificPanel": false,
  "scopeOptionsEnabled": false,
+  "formattingOptionsEnabled": false,
  "collapseMessageWithSubject": false
 }
--- a/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css
+++ b/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css
--- a/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
+++ b/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
--- a/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css
+++ b/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css
--- a/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css.map
+++ b/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css.map
--- a/priv/static/static/js/app.6e2e9ee92450f3681b96.js
+++ b/priv/static/static/js/app.6e2e9ee92450f3681b96.js
--- a/priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
+++ b/priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
--- a/priv/static/static/js/app.8b645dcc4822f7e06077.js
+++ b/priv/static/static/js/app.8b645dcc4822f7e06077.js
--- a/priv/static/static/js/app.8b645dcc4822f7e06077.js.map
+++ b/priv/static/static/js/app.8b645dcc4822f7e06077.js.map
--- a/priv/static/static/js/manifest.004e63f0a7e5719fbbe8.js
+++ b/priv/static/static/js/manifest.004e63f0a7e5719fbbe8.js
--- a/priv/static/static/js/manifest.a83a8ba1f1f30d64bc53.js
+++ b/priv/static/static/js/manifest.a83a8ba1f1f30d64bc53.js
--- a/priv/static/static/js/manifest.a83a8ba1f1f30d64bc53.js.map
+++ b/priv/static/static/js/manifest.a83a8ba1f1f30d64bc53.js.map
--- a/priv/static/static/js/manifest.f70689e27c09390170e6.js
+++ b/priv/static/static/js/manifest.f70689e27c09390170e6.js
--- a/priv/static/static/js/manifest.f70689e27c09390170e6.js.map
+++ b/priv/static/static/js/manifest.f70689e27c09390170e6.js.map
--- a/priv/static/static/js/vendor.117ce7369a023987d44a.js
+++ b/priv/static/static/js/vendor.117ce7369a023987d44a.js
--- a/priv/static/static/js/vendor.117ce7369a023987d44a.js.map
+++ b/priv/static/static/js/vendor.117ce7369a023987d44a.js.map
--- a/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map
+++ b/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map