Merge branch 'update/pleroma-fe-20190125' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!709
2019-01-25 04:57:05 +00:00 · 2019-01-25 04:57:05 +00:00 · 9bf1a4234d
commit 9bf1a4234d
parent 2ebabaeb9c 4b76f14da1
14 changed files with 39 additions and 38 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.3d3e30a9afb8c41739656f496e8c79e6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e58590e04ca06ebbea1e.js></script><script type=text/javascript src=/static/js/vendor.61fac267296f19262d14.js></script><script type=text/javascript src=/static/js/app.76e23c93f1de5902c4d7.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.3d3e30a9afb8c41739656f496e8c79e6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.6802874440f1854a6844.js></script><script type=text/javascript src=/static/js/vendor.61fd03d8471aaadcf63c.js></script><script type=text/javascript src=/static/js/app.5ed04a69c4a6e8b1f455.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -18,5 +18,6 @@
  "hideUserStats": false,
  "loginMethod": "password",
  "webPushNotifications": false,
-  "noAttachmentLinks": false
+  "noAttachmentLinks": false,
+  "nsfwCensorImage": ""
 }
--- a/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js
+++ b/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js
--- a/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js.map
+++ b/priv/static/static/js/app.5ed04a69c4a6e8b1f455.js.map
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js
--- a/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
+++ b/priv/static/static/js/app.76e23c93f1de5902c4d7.js.map
--- a/priv/static/static/js/manifest.6802874440f1854a6844.js
+++ b/priv/static/static/js/manifest.6802874440f1854a6844.js
@ -0,0 +1,2 @@
+!function(e){function t(a){if(r[a])return r[a].exports;var n=r[a]={exports:{},id:a,loaded:!1};return e[a].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var a=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var p,l,s=0,i=[];s<c.length;s++)l=c[s],n[l]&&i.push.apply(i,n[l]),n[l]=0;for(p in o)Object.prototype.hasOwnProperty.call(o,p)&&(e[p]=o[p]);for(a&&a(c,o);i.length;)i.shift().call(null,t);if(o[0])return r[0]=0,t(0)};var r={},n={0:0};t.e=function(e,a){if(0===n[e])return a.call(null,t);if(void 0!==n[e])n[e].push(a);else{n[e]=[a];var r=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:"61fd03d8471aaadcf63c",2:"5ed04a69c4a6e8b1f455"}[e]+".js",r.appendChild(c)}},t.m=e,t.c=r,t.p="/"}([]);
+//# sourceMappingURL=manifest.6802874440f1854a6844.js.map
--- a/priv/static/static/js/manifest.6802874440f1854a6844.js.map
+++ b/priv/static/static/js/manifest.6802874440f1854a6844.js.map
--- a/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
+++ b/priv/static/static/js/manifest.e58590e04ca06ebbea1e.js
@ -1,2 +0,0 @@
-!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:"61fac267296f19262d14",2:"76e23c93f1de5902c4d7"}[e]+".js",n.appendChild(c)}},t.m=e,t.c=n,t.p="/"}([]);
-//# sourceMappingURL=manifest.e58590e04ca06ebbea1e.js.map
--- a/priv/static/static/js/vendor.61fac267296f19262d14.js.map
+++ b/priv/static/static/js/vendor.61fac267296f19262d14.js.map
--- a/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js
+++ b/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js
--- a/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js.map
+++ b/priv/static/static/js/vendor.61fd03d8471aaadcf63c.js.map
--- a/priv/static/sw.js
+++ b/priv/static/sw.js
@ -1,4 +1,4 @@
-var serviceWorkerOption = {"assets":["/static/img/nsfw.50fd83c.png","/static/js/manifest.e58590e04ca06ebbea1e.js","/static/js/vendor.61fac267296f19262d14.js","/static/js/app.76e23c93f1de5902c4d7.js","/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css"]};
+var serviceWorkerOption = {"assets":["/static/img/nsfw.50fd83c.png","/static/js/manifest.6802874440f1854a6844.js","/static/js/vendor.61fd03d8471aaadcf63c.js","/static/js/app.5ed04a69c4a6e8b1f455.js","/static/css/app.3d3e30a9afb8c41739656f496e8c79e6.css"]};
        
        !function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={exports:{},id:r,loaded:!1};return e[r].call(o.exports,o,o.exports,n),o.loaded=!0,o.exports}var t={};return n.m=e,n.c=t,n.p="/",n(0)}([function(e,n,t){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(){return u.default.getItem("vuex-lz").then(function(e){return e.config.webPushNotifications})}function i(){return clients.matchAll({includeUncontrolled:!0}).then(function(e){return e.filter(function(e){var n=e.type;return"window"===n})})}var a=t(1),u=r(a);self.addEventListener("push",function(e){e.data&&e.waitUntil(o().then(function(n){return n&&i().then(function(n){var t=e.data.json();if(0===n.length)return self.registration.showNotification(t.title,t)})}))}),self.addEventListener("notificationclick",function(e){e.notification.close(),e.waitUntil(i().then(function(e){for(var n=0;n<e.length;n++){var t=e[n];if("/"===t.url&&"focus"in t)return t.focus()}if(clients.openWindow)return clients.openWindow("/")}))})},function(e,n){/*!
 	    localForage -- Offline Storage, Improved
--- a/priv/static/sw.js.map
+++ b/priv/static/sw.js.map