diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 14ca29e46..7c979018f 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -304,5 +304,5 @@ dev_email = "" dev_password = "" [version] -current = "2.17.4" +current = "2.18.0" saved = "Fri, 04 Mar 2022 08:55:26 +0000" diff --git a/README.md b/README.md index d9c4521bc..932a552ce 100644 --- a/README.md +++ b/README.md @@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.170.153 | 81.750 | -|app.js |4.207.787 | 404.253 | +|admin.js |2.170.153 | 81.400 | +|app.js |4.207.787 | 410.184 | |boot.js | 868.735 | 2.050 | -|libs.js | 658.812 | 197.270 | -|sieve.js | 0 | 86.196 | +|libs.js | 658.812 | 197.171 | +|sieve.js | 0 | 86.183 | |polyfills.js | 334.608 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.240.095 | 771.804 | +|TOTAL |8.240.095 | 777.273 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 256.831 | 40.814 | 73.606 | 13.591 | 60.877 | 12.166 | -|app.min.js | 515.367 | 190.898 |139.456 | 61.959 |110.485 | 53.232 | +|admin.min.js | 256.831 | 40.457 | 73.606 | 13.519 | 60.877 | 12.094 | +|app.min.js | 515.367 | 191.686 |139.456 | 62.457 |110.485 | 53.823 | |boot.min.js | 84.659 | 1.252 | 26.998 | 778 | 23.643 | 628 | -|libs.min.js | 584.772 | 95.026 |180.901 | 35.140 |155.182 | 31.455 | -|sieve.min.js | 0 | 41.963 | 0 | 10.494 | 0 | 9.460 | +|libs.min.js | 584.772 | 94.990 |180.901 | 35.129 |155.182 | 31.387 | +|sieve.min.js | 0 | 41.961 | 0 | 10.493 | 0 | 9.462 | |polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 | -|TOTAL user |1.217.635 | 287.176 |358.761 | 97.877 |299.485 | 85.315 | -|TOTAL user+sieve |1.217.635 | 329.139 |358.761 |108.371 |299.485 | 94.775 | -|TOTAL admin | 959.099 | 137.092 |292.911 | 49.509 |249.877 | 44.249 | +|TOTAL user |1.217.635 | 287.928 |358.761 | 98.364 |299.485 | 85.838 | +|TOTAL user+sieve |1.217.635 | 329.889 |358.761 |108.857 |299.485 | 95.300 | +|TOTAL admin | 959.099 | 136.699 |292.911 | 49.426 |249.877 | 44.109 | For a user its around 70% smaller and faster than traditional RainLoop. @@ -187,12 +187,12 @@ For a user its around 70% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |------: |------: |------: |--------: | -|app.css | 340.331 | 81.838 | 46.946 | 16.907 | 14.541 | -|app.min.css | 274.947 | 65.769 | 39.647 | 14.962 | 13.163 | +|app.css | 340.331 | 81.312 | 46.946 | 16.869 | 14.493 | +|app.min.css | 274.947 | 65.282 | 39.647 | 14.899 | 13.112 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 29.721 | | 6.762 | 5.867 | -|admin.min.css | | 23.880 | | 6.124 | 5.382 | +|admin.css | | 29.828 | | 6.788 | 5.889 | +|admin.min.css | | 23.960 | | 6.148 | 5.393 | ### PGP RainLoop uses the old OpenPGP.js v2 diff --git a/dev/Knoin/AbstractScreen.js b/dev/Knoin/AbstractScreen.js index d1797364f..ef5cb2fbe 100644 --- a/dev/Knoin/AbstractScreen.js +++ b/dev/Knoin/AbstractScreen.js @@ -31,7 +31,7 @@ export class AbstractScreen { let route = new Crossroads(), fMatcher = (this.onRoute || (()=>0)).bind(this); - routes.forEach(item => item && route && (route.addRoute(item[0], fMatcher).rules = item[1])); + routes.forEach(item => item && (route.addRoute(item[0], fMatcher).rules = item[1])); this.__cross = route; } diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index 6526aaa1c..c084b9015 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -52,7 +52,6 @@ const // Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined if (!vmDom.showModal) { - vmDom.classList.add('polyfill'); vmDom.showModal = () => { vmDom.backdrop || vmDom.before(vmDom.backdrop = Element.fromHTML('
')); @@ -67,7 +66,7 @@ const vmDom.returnValue = v; vmDom.removeAttribute('open', null); vmDom.open = false; - vmDom.dispatchEvent(new CustomEvent('close')); +// vmDom.dispatchEvent(new CustomEvent('close')); // } }; } diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index d9c178956..4b06e2f32 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.17.4. +This app packages SnappyMail 2.18.0. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 681893b51..255102d7a 100644 --- a/integrations/cloudron/Dockerfile +++ b/integrations/cloudron/Dockerfile @@ -4,7 +4,7 @@ RUN mkdir -p /app/code WORKDIR /app/code # If you change the extraction below, be sure to test on scaleway -VERSION=2.17.4 +VERSION=2.18.0 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \ unzip /tmp/snappymail.zip -d /app/code && \ rm /tmp/snappymail.zip && \ diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION index d14c10042..5b8407389 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.17.4 \ No newline at end of file +2.18.0 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 8b3ad24f8..0b27117e9 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -4,7 +4,7 @@ SnappyMail SnappyMail Webmail Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07). - 2.17.4 + 2.18.0 agpl SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli SnappyMail diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl index 15d395823..392d63c80 100644 --- a/integrations/virtualmin/snappymail.pl +++ b/integrations/virtualmin/snappymail.pl @@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a # script_snappymail_versions() sub script_snappymail_versions { -return ( "2.17.4" ); +return ( "2.18.0" ); } sub script_snappymail_version_desc diff --git a/package.json b/package.json index f632d14ee..1885a2a9c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "title": "SnappyMail", "description": "Simple, modern & fast web-based email client", "private": true, - "version": "2.17.4", + "version": "2.18.0", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php index 61f300306..27ed01b54 100644 --- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php +++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php @@ -13,7 +13,10 @@ use Sabre\VObject\Property; * @copyright Copyright (C) SnappyMail (https://snappymail.eu/) * @author DJMaze (https://snappymail.eu/) * @license http://sabre.io/license/ Modified BSD License + * + * https://github.com/sabre-io/vobject/issues/589 */ + class XCrypto extends Property //class XCrypto extends Text {