Merge branch '2019-02-06-update-frontend' into 'develop'

update frontend See merge request pleroma/pleroma!780
2019-02-06 09:47:36 +00:00 · 2019-02-06 09:47:36 +00:00 · 3c08e20d68
commit 3c08e20d68
parent c46490b199 78a51f4dd4
19 changed files with 3 additions and 6 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.42c43da15d7ab16ad8e42d21fcfc5a43.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.6aa5664a1a2c0832ce7b.js></script><script type=text/javascript src=/static/js/vendor.56a115a1d7339d6811a0.js></script><script type=text/javascript src=/static/js/app.59ebcfb47f86a7a5ba3f.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.d75cda10f04aeefec7b657f8244070e9.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f00ab54db04706aab2c9.js></script><script type=text/javascript src=/static/js/vendor.5173dfeead1ded3d1f46.js></script><script type=text/javascript src=/static/js/app.0e4952ec8d775da840f1.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -19,8 +19,5 @@
  "loginMethod": "password",
  "webPushNotifications": false,
  "noAttachmentLinks": false,
-  "nsfwCensorImage": "",
+  "nsfwCensorImage": ""
  "useOneClickNsfw": true,
  "playVideosInline": false,
  "useContainFit": false
 }
--- a/priv/static/static/css/app.42c43da15d7ab16ad8e42d21fcfc5a43.css
+++ b/priv/static/static/css/app.42c43da15d7ab16ad8e42d21fcfc5a43.css
--- a/priv/static/static/css/app.42c43da15d7ab16ad8e42d21fcfc5a43.css.map
+++ b/priv/static/static/css/app.42c43da15d7ab16ad8e42d21fcfc5a43.css.map
--- a/priv/static/static/css/app.d75cda10f04aeefec7b657f8244070e9.css
+++ b/priv/static/static/css/app.d75cda10f04aeefec7b657f8244070e9.css
--- a/priv/static/static/css/app.d75cda10f04aeefec7b657f8244070e9.css.map
+++ b/priv/static/static/css/app.d75cda10f04aeefec7b657f8244070e9.css.map
--- a/priv/static/static/js/app.0e4952ec8d775da840f1.js
+++ b/priv/static/static/js/app.0e4952ec8d775da840f1.js
--- a/priv/static/static/js/app.0e4952ec8d775da840f1.js.map
+++ b/priv/static/static/js/app.0e4952ec8d775da840f1.js.map
--- a/priv/static/static/js/app.59ebcfb47f86a7a5ba3f.js
+++ b/priv/static/static/js/app.59ebcfb47f86a7a5ba3f.js
--- a/priv/static/static/js/app.59ebcfb47f86a7a5ba3f.js.map
+++ b/priv/static/static/js/app.59ebcfb47f86a7a5ba3f.js.map
--- a/priv/static/static/js/manifest.6aa5664a1a2c0832ce7b.js
+++ b/priv/static/static/js/manifest.6aa5664a1a2c0832ce7b.js
--- a/priv/static/static/js/manifest.f00ab54db04706aab2c9.js
+++ b/priv/static/static/js/manifest.f00ab54db04706aab2c9.js
--- a/priv/static/static/js/manifest.f00ab54db04706aab2c9.js.map
+++ b/priv/static/static/js/manifest.f00ab54db04706aab2c9.js.map
--- a/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js
+++ b/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js
--- a/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js.map
+++ b/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js.map
--- a/priv/static/static/js/vendor.56a115a1d7339d6811a0.js.map
+++ b/priv/static/static/js/vendor.56a115a1d7339d6811a0.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
--- a/priv/static/sw.js.map
+++ b/priv/static/sw.js.map
		`@ -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.42c43da15d7ab16ad8e42d21fcfc5a43.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.6aa5664a1a2c0832ce7b.js></script><script type=text/javascript src=/static/js/vendor.56a115a1d7339d6811a0.js></script><script type=text/javascript src=/static/js/app.59ebcfb47f86a7a5ba3f.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.d75cda10f04aeefec7b657f8244070e9.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f00ab54db04706aab2c9.js></script><script type=text/javascript src=/static/js/vendor.5173dfeead1ded3d1f46.js></script><script type=text/javascript src=/static/js/app.0e4952ec8d775da840f1.js></script></body></html>