Merge branch '2018-12-29-update-frontend' into 'develop'

update frontend See merge request pleroma/pleroma!606
2018-12-29 13:47:45 +00:00 · 2018-12-29 13:47:45 +00:00 · e8ba390fe9
commit e8ba390fe9
parent 3dc5f04976 e1227d812c
19 changed files with 7 additions and 5 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.285fa56c62b811bbd37880f7e2656b13.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.60e190da7cc4cc4711dc.js></script><script type=text/javascript src=/static/js/vendor.48d4753220bd83360796.js></script><script type=text/javascript src=/static/js/app.6cb7378f44092df9536a.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.44bcebbab7b3203648fdb538eb16129b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.18ee0a4963e1e9ec7ea6.js></script><script type=text/javascript src=/static/js/vendor.21f9327c919db89265c3.js></script><script type=text/javascript src=/static/js/app.f5ecd4e55f996aad6b8a.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -4,8 +4,8 @@
  "logo": "/static/logo.png",
  "logoMask": true,
  "logoMargin": ".1em",
-  "redirectRootNoLogin": "/~/main/all",
-  "redirectRootLogin": "/~/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "redirectRootLogin": "/main/friends",
  "chatDisabled": false,
  "showInstanceSpecificPanel": false,
  "scopeOptionsEnabled": false,
@ -16,5 +16,7 @@
  "alwaysShowSubjectInput": true,
  "hidePostStats": false,
  "hideUserStats": false,
-  "loginMethod": "password"
+  "loginMethod": "password",
+  "webPushNotifications": false,
+  "noAttachmentLinks": false
 }
--- a/priv/static/static/css/app.285fa56c62b811bbd37880f7e2656b13.css
+++ b/priv/static/static/css/app.285fa56c62b811bbd37880f7e2656b13.css
--- a/priv/static/static/css/app.285fa56c62b811bbd37880f7e2656b13.css.map
+++ b/priv/static/static/css/app.285fa56c62b811bbd37880f7e2656b13.css.map
--- a/priv/static/static/css/app.44bcebbab7b3203648fdb538eb16129b.css
+++ b/priv/static/static/css/app.44bcebbab7b3203648fdb538eb16129b.css
--- a/priv/static/static/css/app.44bcebbab7b3203648fdb538eb16129b.css.map
+++ b/priv/static/static/css/app.44bcebbab7b3203648fdb538eb16129b.css.map
--- a/priv/static/static/js/app.6cb7378f44092df9536a.js
+++ b/priv/static/static/js/app.6cb7378f44092df9536a.js
--- a/priv/static/static/js/app.6cb7378f44092df9536a.js.map
+++ b/priv/static/static/js/app.6cb7378f44092df9536a.js.map
--- a/priv/static/static/js/app.f5ecd4e55f996aad6b8a.js
+++ b/priv/static/static/js/app.f5ecd4e55f996aad6b8a.js
--- a/priv/static/static/js/app.f5ecd4e55f996aad6b8a.js.map
+++ b/priv/static/static/js/app.f5ecd4e55f996aad6b8a.js.map
--- a/priv/static/static/js/manifest.18ee0a4963e1e9ec7ea6.js
+++ b/priv/static/static/js/manifest.18ee0a4963e1e9ec7ea6.js
--- a/priv/static/static/js/manifest.18ee0a4963e1e9ec7ea6.js.map
+++ b/priv/static/static/js/manifest.18ee0a4963e1e9ec7ea6.js.map
--- a/priv/static/static/js/manifest.60e190da7cc4cc4711dc.js
+++ b/priv/static/static/js/manifest.60e190da7cc4cc4711dc.js
--- a/priv/static/static/js/vendor.21f9327c919db89265c3.js
+++ b/priv/static/static/js/vendor.21f9327c919db89265c3.js
--- a/priv/static/static/js/vendor.21f9327c919db89265c3.js.map
+++ b/priv/static/static/js/vendor.21f9327c919db89265c3.js.map
--- a/priv/static/static/js/vendor.48d4753220bd83360796.js
+++ b/priv/static/static/js/vendor.48d4753220bd83360796.js
--- a/priv/static/static/js/vendor.48d4753220bd83360796.js.map
+++ b/priv/static/static/js/vendor.48d4753220bd83360796.js.map
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
--- a/priv/static/sw.js.map
+++ b/priv/static/sw.js.map