Merge branch '2019-1-1-update-frontend' into 'develop'

update frontend See merge request pleroma/pleroma!616
2019-01-01 16:55:37 +00:00 · 2019-01-01 16:55:37 +00:00 · b9ac7067eb
commit b9ac7067eb
parent 32541172cd 1dd0e0ed4c
17 changed files with 3 additions and 3 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.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>
+<!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.c52cbb57296d5c682ff405d562e83a9b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e833e1c75fbc9f2b69b4.js></script><script type=text/javascript src=/static/js/vendor.b6e63c523d95d763c254.js></script><script type=text/javascript src=/static/js/app.1c83eacd8eddeef56c69.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -11,7 +11,7 @@
  "scopeOptionsEnabled": false,
  "formattingOptionsEnabled": false,
  "collapseMessageWithSubject": false,
-  "scopeCopy": false,
+  "scopeCopy": true,
  "subjectLineBehavior": "email",
  "alwaysShowSubjectInput": true,
  "hidePostStats": false,
--- 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/css/app.c52cbb57296d5c682ff405d562e83a9b.css
+++ b/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css
--- a/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css.map
+++ b/priv/static/static/css/app.c52cbb57296d5c682ff405d562e83a9b.css.map
--- a/priv/static/static/js/app.1c83eacd8eddeef56c69.js
+++ b/priv/static/static/js/app.1c83eacd8eddeef56c69.js
--- a/priv/static/static/js/app.1c83eacd8eddeef56c69.js.map
+++ b/priv/static/static/js/app.1c83eacd8eddeef56c69.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.e833e1c75fbc9f2b69b4.js
+++ b/priv/static/static/js/manifest.e833e1c75fbc9f2b69b4.js
--- a/priv/static/static/js/manifest.e833e1c75fbc9f2b69b4.js.map
+++ b/priv/static/static/js/manifest.e833e1c75fbc9f2b69b4.js.map
--- a/priv/static/static/js/vendor.21f9327c919db89265c3.js.map
+++ b/priv/static/static/js/vendor.21f9327c919db89265c3.js.map
--- a/priv/static/static/js/vendor.b6e63c523d95d763c254.js
+++ b/priv/static/static/js/vendor.b6e63c523d95d763c254.js
--- a/priv/static/static/js/vendor.b6e63c523d95d763c254.js.map
+++ b/priv/static/static/js/vendor.b6e63c523d95d763c254.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.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>				<!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.c52cbb57296d5c682ff405d562e83a9b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e833e1c75fbc9f2b69b4.js></script><script type=text/javascript src=/static/js/vendor.b6e63c523d95d763c254.js></script><script type=text/javascript src=/static/js/app.1c83eacd8eddeef56c69.js></script></body></html>