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

update frontend See merge request pleroma/pleroma!850
2019-02-21 08:11:06 +00:00 · 2019-02-21 08:11:06 +00:00 · 45b06860d3
commit 45b06860d3
parent 1f85c9c9c7 553ce57d42
19 changed files with 976 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.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>
+<!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.f8cd72107c472bb05fac426b53ec499b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.7bce4ebd4510d2c5e6d8.js></script><script type=text/javascript src=/static/js/vendor.2a9228e5bcaf054e8060.js></script><script type=text/javascript src=/static/js/app.2a6f16b7ee4b2642dacc.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -13,11 +13,13 @@
  "collapseMessageWithSubject": false,
  "scopeCopy": true,
  "subjectLineBehavior": "email",
  "postContentType": "text/plain",
  "alwaysShowSubjectInput": true,
  "hidePostStats": false,
  "hideUserStats": false,
  "loginMethod": "password",
  "webPushNotifications": false,
  "noAttachmentLinks": false,
-  "nsfwCensorImage": ""
+  "nsfwCensorImage": "",
  "showFeaturesPanel": true
 }
--- 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/css/app.f8cd72107c472bb05fac426b53ec499b.css
+++ b/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css
--- a/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css.map
+++ b/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css.map
--- a/priv/static/static/emoji.json
+++ b/priv/static/static/emoji.json
--- 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.2a6f16b7ee4b2642dacc.js
+++ b/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js
--- a/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js.map
+++ b/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js.map
--- a/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js
+++ b/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js
--- a/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js.map
+++ b/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js.map
--- a/priv/static/static/js/manifest.f00ab54db04706aab2c9.js
+++ b/priv/static/static/js/manifest.f00ab54db04706aab2c9.js
--- a/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js
+++ b/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js
--- a/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js.map
+++ b/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js.map
--- a/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js.map
+++ b/priv/static/static/js/vendor.5173dfeead1ded3d1f46.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
		`@ -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.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>				<!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.f8cd72107c472bb05fac426b53ec499b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.7bce4ebd4510d2c5e6d8.js></script><script type=text/javascript src=/static/js/vendor.2a9228e5bcaf054e8060.js></script><script type=text/javascript src=/static/js/app.2a6f16b7ee4b2642dacc.js></script></body></html>