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

update pleroma frontend See merge request pleroma/pleroma!709
2019-01-25 04:57:05 +00:00 · 2019-01-25 04:57:05 +00:00 · 9bf1a4234d
commit 9bf1a4234d
parent 2ebabaeb9c 4b76f14da1
14 changed files with 3 additions and 2 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><!--server-generated-meta--><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.3d3e30a9afb8c41739656f496e8c79e6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e58590e04ca06ebbea1e.js></script><script type=text/javascript src=/static/js/vendor.61fac267296f19262d14.js></script><script type=text/javascript src=/static/js/app.76e23c93f1de5902c4d7.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><!--server-generated-meta--><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.3d3e30a9afb8c41739656f496e8c79e6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.6802874440f1854a6844.js></script><script type=text/javascript src=/static/js/vendor.61fd03d8471aaadcf63c.js></script><script type=text/javascript src=/static/js/app.5ed04a69c4a6e8b1f455.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -18,5 +18,6 @@
  "hideUserStats": false,
  "loginMethod": "password",
  "webPushNotifications": false,
-  "noAttachmentLinks": false
+  "noAttachmentLinks": false,
+  "nsfwCensorImage": ""
 }
--- a/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js
+++ b/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js
--- a/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js.map
+++ b/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js.map
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
--- a/priv/static/static/js/manifest.6802874440f1854a6844.js
+++ b/priv/static/static/js/manifest.6802874440f1854a6844.js
--- a/priv/static/static/js/manifest.6802874440f1854a6844.js.map
+++ b/priv/static/static/js/manifest.6802874440f1854a6844.js.map
--- a/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
+++ b/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
--- a/priv/static/static/js/vendor.61fac267296f19262d14.js.map
+++ b/priv/static/static/js/vendor.61fac267296f19262d14.js.map
--- a/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js
+++ b/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js
--- a/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js.map
+++ b/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js.map
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
--- a/priv/static/sw.js.map
+++ b/priv/static/sw.js.map