Merge branch 'new-routes-integration' into 'develop'

update frontend See merge request pleroma/pleroma!573
2018-12-18 15:41:38 +00:00 · 2018-12-18 15:41:38 +00:00 · c9ddcd803b
commit c9ddcd803b
parent 5177426ec5 9c4344e16c
16 changed files with 4 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><!--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.a37e07355ec1b0b45e84807615297c27.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f0b8300215e3fdbb725f.js></script><script type=text/javascript src=/static/js/vendor.b578d16088622c18d886.js></script><script type=text/javascript src=/static/js/app.0220742f52d6912415d5.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.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>
--- 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",
+  "redirectRootNoLogin": "/~/main/all",
-  "redirectRootLogin": "/main/friends",
+  "redirectRootLogin": "/~/main/friends",
  "chatDisabled": false,
  "showInstanceSpecificPanel": false,
  "scopeOptionsEnabled": 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.a37e07355ec1b0b45e84807615297c27.css
+++ b/priv/static/static/css/app.a37e07355ec1b0b45e84807615297c27.css
--- a/priv/static/static/css/app.a37e07355ec1b0b45e84807615297c27.css.map
+++ b/priv/static/static/css/app.a37e07355ec1b0b45e84807615297c27.css.map
--- a/priv/static/static/js/app.0220742f52d6912415d5.js
+++ b/priv/static/static/js/app.0220742f52d6912415d5.js
--- a/priv/static/static/js/app.0220742f52d6912415d5.js.map
+++ b/priv/static/static/js/app.0220742f52d6912415d5.js.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/manifest.60e190da7cc4cc4711dc.js
+++ b/priv/static/static/js/manifest.60e190da7cc4cc4711dc.js
--- a/priv/static/static/js/manifest.60e190da7cc4cc4711dc.js.map
+++ b/priv/static/static/js/manifest.60e190da7cc4cc4711dc.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/static/js/vendor.b578d16088622c18d886.js.map
+++ b/priv/static/static/js/vendor.b578d16088622c18d886.js.map
--- 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.a37e07355ec1b0b45e84807615297c27.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f0b8300215e3fdbb725f.js></script><script type=text/javascript src=/static/js/vendor.b578d16088622c18d886.js></script><script type=text/javascript src=/static/js/app.0220742f52d6912415d5.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.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>