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

Update pleroma frontend See merge request pleroma/pleroma!385
2018-10-25 00:16:15 +00:00 · 2018-10-25 00:16:15 +00:00 · 4b2a586942
commit 4b2a586942
parent 8cc08b94ec 7cb227dc62
12 changed files with 52 additions and 49 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.eee3fdcefdfdc13b7a9a.js></script><script type=text/javascript src=/static/js/vendor.1729433de915d5fd6a8e.js></script><script type=text/javascript src=/static/js/app.4687cd74d92cc8396de6.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.0a010c91e43b948ff1a3.js></script><script type=text/javascript src=/static/js/vendor.865340b21f539d34e2e1.js></script><script type=text/javascript src=/static/js/app.d429b9c3b1c1f499710c.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -10,5 +10,7 @@
  "showInstanceSpecificPanel": false,
  "scopeOptionsEnabled": false,
  "formattingOptionsEnabled": false,
-  "collapseMessageWithSubject": false
+  "collapseMessageWithSubject": false,
+  "hidePostStats": false,
+  "hideUserStats": false
 }
--- a/priv/static/static/js/app.4687cd74d92cc8396de6.js
+++ b/priv/static/static/js/app.4687cd74d92cc8396de6.js
--- a/priv/static/static/js/app.4687cd74d92cc8396de6.js.map
+++ b/priv/static/static/js/app.4687cd74d92cc8396de6.js.map
--- a/priv/static/static/js/app.d429b9c3b1c1f499710c.js
+++ b/priv/static/static/js/app.d429b9c3b1c1f499710c.js
--- a/priv/static/static/js/app.d429b9c3b1c1f499710c.js.map
+++ b/priv/static/static/js/app.d429b9c3b1c1f499710c.js.map
--- a/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js
+++ b/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js
@ -1,2 +1,2 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var r=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var p,l,s=0,d=[];s<c.length;s++)l=c[s],a[l]&&d.push.apply(d,a[l]),a[l]=0;for(p in o)Object.prototype.hasOwnProperty.call(o,p)&&(e[p]=o[p]);for(r&&r(c,o);d.length;)d.shift().call(null,t);if(o[0])return n[0]=0,t(0)};var n={},a={0:0};t.e=function(e,r){if(0===a[e])return r.call(null,t);if(void 0!==a[e])a[e].push(r);else{a[e]=[r];var n=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.src=t.p+"static/js/"+e+"."+{1:"1729433de915d5fd6a8e",2:"4687cd74d92cc8396de6"}[e]+".js",n.appendChild(c)}},t.m=e,t.c=n,t.p="/"}([]);
-//# sourceMappingURL=manifest.eee3fdcefdfdc13b7a9a.js.map
+!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var r=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var p,l,s=0,i=[];s<c.length;s++)l=c[s],a[l]&&i.push.apply(i,a[l]),a[l]=0;for(p in o)Object.prototype.hasOwnProperty.call(o,p)&&(e[p]=o[p]);for(r&&r(c,o);i.length;)i.shift().call(null,t);if(o[0])return n[0]=0,t(0)};var n={},a={0:0};t.e=function(e,r){if(0===a[e])return r.call(null,t);if(void 0!==a[e])a[e].push(r);else{a[e]=[r];var n=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.src=t.p+"static/js/"+e+"."+{1:"865340b21f539d34e2e1",2:"d429b9c3b1c1f499710c"}[e]+".js",n.appendChild(c)}},t.m=e,t.c=n,t.p="/"}([]);
+//# sourceMappingURL=manifest.0a010c91e43b948ff1a3.js.map
--- a/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js.map
+++ b/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js.map
--- a/priv/static/static/js/vendor.1729433de915d5fd6a8e.js
+++ b/priv/static/static/js/vendor.1729433de915d5fd6a8e.js
--- a/priv/static/static/js/vendor.1729433de915d5fd6a8e.js.map
+++ b/priv/static/static/js/vendor.1729433de915d5fd6a8e.js.map
--- a/priv/static/static/js/vendor.865340b21f539d34e2e1.js
+++ b/priv/static/static/js/vendor.865340b21f539d34e2e1.js
--- a/priv/static/static/js/vendor.865340b21f539d34e2e1.js.map
+++ b/priv/static/static/js/vendor.865340b21f539d34e2e1.js.map