Merge branch 'update-pleroma-frontend' into 'develop'

update-pleroma-frontend See merge request pleroma/pleroma!494
2018-12-03 06:03:09 +00:00 · 2018-12-03 06:03:09 +00:00 · a3f9cca78c
commit a3f9cca78c
parent e1204c6f25 a7b1a66be3
13 changed files with 3 additions and 1 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><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.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.34667c2817916147413f.js></script><script type=text/javascript src=/static/js/vendor.32c621c7157f34c20923.js></script><script type=text/javascript src=/static/js/app.065638d22ade92dea420.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><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.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.18df0da570d88ba76ec5.js></script><script type=text/javascript src=/static/js/vendor.0e895ca116d5ba12f2b6.js></script><script type=text/javascript src=/static/js/app.3f7c9aaedc6b87fa9653.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -11,6 +11,8 @@
  "scopeOptionsEnabled": false,
  "formattingOptionsEnabled": false,
  "collapseMessageWithSubject": false,
+  "scopeCopy": false,
+  "subjectLineBehavior": "email",
  "hidePostStats": false,
  "hideUserStats": false,
  "loginMethod": "password"
--- a/priv/static/static/js/app.065638d22ade92dea420.js
+++ b/priv/static/static/js/app.065638d22ade92dea420.js
--- a/priv/static/static/js/app.065638d22ade92dea420.js.map
+++ b/priv/static/static/js/app.065638d22ade92dea420.js.map
--- a/priv/static/static/js/app.3f7c9aaedc6b87fa9653.js
+++ b/priv/static/static/js/app.3f7c9aaedc6b87fa9653.js
--- a/priv/static/static/js/app.3f7c9aaedc6b87fa9653.js.map
+++ b/priv/static/static/js/app.3f7c9aaedc6b87fa9653.js.map
--- a/priv/static/static/js/manifest.18df0da570d88ba76ec5.js
+++ b/priv/static/static/js/manifest.18df0da570d88ba76ec5.js
--- a/priv/static/static/js/manifest.18df0da570d88ba76ec5.js.map
+++ b/priv/static/static/js/manifest.18df0da570d88ba76ec5.js.map
--- a/priv/static/static/js/manifest.34667c2817916147413f.js
+++ b/priv/static/static/js/manifest.34667c2817916147413f.js
--- a/priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js
+++ b/priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js
--- a/priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js.map
+++ b/priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js.map
--- a/priv/static/static/js/vendor.32c621c7157f34c20923.js
+++ b/priv/static/static/js/vendor.32c621c7157f34c20923.js
--- a/priv/static/static/js/vendor.32c621c7157f34c20923.js.map
+++ b/priv/static/static/js/vendor.32c621c7157f34c20923.js.map