Pleroma

From: sadposter Date: Sat, 9 Nov 2019 19:11:33 +0000 (+0000) Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=55cc96bcf9331b8b56c64251cec0878529a543a6;p=akkoma Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop --- 55cc96bcf9331b8b56c64251cec0878529a543a6 diff --cc priv/static/index.html index 2518808c4,f1a26cc95..e995a811b --- a/priv/static/index.html +++ b/priv/static/index.html @@@ -1,1 -1,1 +1,1 @@@ - Pleroma

-Pleroma

++Pleroma

diff --cc priv/static/static/styles.json index 31a6e0f14,842092c44..9ebc60eaa --- a/priv/static/static/styles.json +++ b/priv/static/static/styles.json @@@ -12,5 -11,5 +11,9 @@@ "redmond-xxi": "/static/themes/redmond-xxi.json", "breezy-dark": "/static/themes/breezy-dark.json", "breezy-light": "/static/themes/breezy-light.json", ++<<<<<<< HEAD + "ihatebeingalive": "/static/themes/ihatebeingalive.json" ++======= + "mammal": "/static/themes/mammal.json" ++>>>>>>> 8a03ce50ea30df3754f2d9856829b036c878e063 } diff --cc priv/static/sw-pleroma.js index add8466a9,ec6185afc..6c1c99498 --- a/priv/static/sw-pleroma.js +++ b/priv/static/sw-pleroma.js @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD +var serviceWorkerOption = {"assets":["/static/img/nsfw.ca95de9.png","/static/css/app.fd71461124f3eb029b1b.css","/static/js/app.1a32adc2a9166c7b0a3d.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.131a5a4717d2cca805ad.js","/static/js/2.a9fc9624efb9af428eec.js"]}; ++======= + var serviceWorkerOption = {"assets":["/static/img/nsfw.74818f9.png","/static/css/app.fd71461124f3eb029b1b.css","/static/js/app.105d64a8fcdd6724ccde.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.5c3fab032deb5f2793cb.js","/static/js/2.73375b727cef616c59b4.js"]}; ++>>>>>>> 8a03ce50ea30df3754f2d9856829b036c878e063 !function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t(t.s=0)}([function(e,n,t){"use strict";var r,o=t(1),i=(r=o)&&r.__esModule?r:{default:r};function a(){return clients.matchAll({includeUncontrolled:!0}).then(function(e){return e.filter(function(e){return"window"===e.type})})}self.addEventListener("push",function(e){e.data&&e.waitUntil(i.default.getItem("vuex-lz").then(function(e){return e.config.webPushNotifications}).then(function(n){return n&&a().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(a().then(function(e){for(var n=0;n