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

2018 12 10 update frontend See merge request pleroma/pleroma!534
2018-12-10 19:55:32 +00:00 · 2018-12-10 19:55:32 +00:00 · 37bd32e58b
commit 37bd32e58b
parent 0863ec2737 d6bf06ab4f
17 changed files with 5 additions and 4 deletions
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -807,8 +807,8 @@ def wait_and_refresh(timeout, %User{} = a, %User{} = b) do
  end

  def parse_bio(bio, user \\ %User{info: %{source_data: %{}}})
-  def parse_bio(nil, user), do: ""
-  def parse_bio(bio, user) when bio == "", do: bio
+  def parse_bio(nil, _user), do: ""
+  def parse_bio(bio, _user) when bio == "", do: bio

  def parse_bio(bio, user) do
    mentions = Formatter.parse_mentions(bio)
--- 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.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>
+<!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.ef3dfe574a06c79d5c5ca88943ef4673.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f60b0c5412942809e9e3.js></script><script type=text/javascript src=/static/js/vendor.3be52ab73ddf60b35112.js></script><script type=text/javascript src=/static/js/app.c10f63ec367fc4f92eea.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -13,6 +13,7 @@
  "collapseMessageWithSubject": false,
  "scopeCopy": false,
  "subjectLineBehavior": "email",
+  "alwaysShowSubjectInput": true,
  "hidePostStats": false,
  "hideUserStats": false,
  "loginMethod": "password"
--- a/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
+++ b/priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
--- a/priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css
+++ b/priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css
--- a/priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css.map
+++ b/priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css.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/app.c10f63ec367fc4f92eea.js
+++ b/priv/static/static/js/app.c10f63ec367fc4f92eea.js
--- a/priv/static/static/js/app.c10f63ec367fc4f92eea.js.map
+++ b/priv/static/static/js/app.c10f63ec367fc4f92eea.js.map
--- a/priv/static/static/js/manifest.18df0da570d88ba76ec5.js
+++ b/priv/static/static/js/manifest.18df0da570d88ba76ec5.js
--- a/priv/static/static/js/manifest.f60b0c5412942809e9e3.js
+++ b/priv/static/static/js/manifest.f60b0c5412942809e9e3.js
--- a/priv/static/static/js/manifest.f60b0c5412942809e9e3.js.map
+++ b/priv/static/static/js/manifest.f60b0c5412942809e9e3.js.map
--- 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.3be52ab73ddf60b35112.js
+++ b/priv/static/static/js/vendor.3be52ab73ddf60b35112.js
--- a/priv/static/static/js/vendor.3be52ab73ddf60b35112.js.map
+++ b/priv/static/static/js/vendor.3be52ab73ddf60b35112.js.map