From 115437fb6a260ab6b75906c0d923b2ceb3972edc Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sat, 5 Nov 2022 12:07:26 +0100 Subject: [PATCH] v2.20.2 --- .../files/usr/local/include/application.ini | 2 +- CHANGELOG.md | 19 +++++++++++++++ README.md | 24 +++++++++---------- build/nextcloud.php | 4 ++-- dev/Knoin/AbstractViews.js | 4 ++-- integrations/cloudron/DESCRIPTION.md | 2 +- integrations/cloudron/Dockerfile | 2 +- .../nextcloud/snappymail/appinfo/info.xml | 2 +- integrations/virtualmin/snappymail.pl | 2 +- package.json | 2 +- 10 files changed, 41 insertions(+), 22 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 4655a1599..03c12d1ff 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -290,5 +290,5 @@ dev_email = "" dev_password = "" [version] -current = "2.20.0" +current = "2.20.2" saved = "Fri, 30 Sep 2022 12:34:56 +0000" diff --git a/CHANGELOG.md b/CHANGELOG.md index 642c3421f..bb9e1fa1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## 2.20.2 – 2022-11-05 + +### Added +- Add more search operators (i.e. copy lots of Gmail ones) + [#625](https://github.com/the-djmaze/snappymail/issues/625) + +### Changed +- Some CSS borders to var(--border-color) + +### Fixed +- pgpDecrypt() using MailVelope the decrypt message was not green +- Shift + F in search bar resulted in forwarding message + [#624](https://github.com/the-djmaze/snappymail/issues/624) + +### Nextcloud +- auto login mechanism not working anymore + [#627](https://github.com/the-djmaze/snappymail/issues/627) + + ## 2.20.1 – 2022-11-04 ### Added diff --git a/README.md b/README.md index 24c15f92a..51643e8d6 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.545 | -|app.js |4.207.787 | 406.032 | +|admin.js |2.170.153 | 81.587 | +|app.js |4.207.787 | 406.110 | |boot.js | 868.735 | 2.050 | |libs.js | 658.812 | 192.965 | |sieve.js | 0 | 86.121 | |polyfills.js | 334.608 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.240.095 | 768.998 | +|TOTAL |8.240.095 | 769.118 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 256.831 | 40.255 | 73.606 | 13.435 | 60.877 | 12.047 | -|app.min.js | 515.367 | 188.046 |139.456 | 62.537 |110.485 | 53.693 | +|admin.min.js | 256.831 | 40.266 | 73.606 | 13.442 | 60.877 | 12.047 | +|app.min.js | 515.367 | 188.117 |139.456 | 62.542 |110.485 | 53.594 | |boot.min.js | 84.659 | 1.252 | 26.998 | 778 | 23.643 | 628 | |libs.min.js | 584.772 | 92.055 |180.901 | 34.113 |155.182 | 30.641 | |sieve.min.js | 0 | 41.926 | 0 | 10.484 | 0 | 9.451 | |polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 | -|TOTAL user |1.217.635 | 281.353 |358.761 | 97.428 |299.485 | 84.962 | -|TOTAL user+sieve |1.217.635 | 323.279 |358.761 |107.912 |299.485 | 94.413 | -|TOTAL admin | 959.099 | 133.562 |292.911 | 48.326 |249.877 | 43.316 | +|TOTAL user |1.217.635 | 281.424 |358.761 | 97.433 |299.485 | 84.863 | +|TOTAL user+sieve |1.217.635 | 323.350 |358.761 |107.917 |299.485 | 94.314 | +|TOTAL admin | 959.099 | 133.573 |292.911 | 48.333 |249.877 | 43.316 | 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 | 82.870 | 46.946 | 17.215 | 14.727 | -|app.min.css | 274.947 | 66.646 | 39.647 | 15.260 | 13.322 | +|app.css | 340.331 | 83.119 | 46.946 | 17.231 | 14.754 | +|app.min.css | 274.947 | 66.879 | 39.647 | 15.274 | 13.333 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 30.506 | | 6.907 | 5.998 | -|admin.min.css | | 24.677 | | 6.267 | 5.498 | +|admin.css | | 30.603 | | 6.925 | 6.004 | +|admin.min.css | | 24.764 | | 6.286 | 5.512 | ### PGP RainLoop uses the old OpenPGP.js v2 diff --git a/build/nextcloud.php b/build/nextcloud.php index a9bdf7907..e3708995c 100755 --- a/build/nextcloud.php +++ b/build/nextcloud.php @@ -14,7 +14,7 @@ $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymai foreach ($files as $file) { if (is_file($file)) { $newFile = str_replace('\\', '/', $file); - $newFile = str_replace("'snappymail/v/'.", '', $newFile); +// $newFile = str_replace("'snappymail/v/'.", '', $newFile); $nc_tar->addFile($file, "snappymail/app/{$newFile}"); } } @@ -28,7 +28,7 @@ $nc_tar->addFile('.htaccess', 'snappymail/app/.htaccess'); $index = file_get_contents('index.php'); $index = str_replace('0.0.0', $package->version, $index); -$index = str_replace('snappymail/v/', '', $index); +//$index = str_replace('snappymail/v/', '', $index); $nc_tar->addFromString('snappymail/app/index.php', $index); $nc_tar->addFile('README.md', 'snappymail/app/README.md'); $nc_tar->addFile('CHANGELOG.md', 'snappymail/CHANGELOG.md'); diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js index 9a7abac5d..91be6625e 100644 --- a/dev/Knoin/AbstractViews.js +++ b/dev/Knoin/AbstractViews.js @@ -1,7 +1,7 @@ import ko from 'ko'; import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko'; -import { keyScope, SettingsGet, leftPanelDisabled, elementById } from 'Common/Globals'; +import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, elementById } from 'Common/Globals'; import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin'; import { SaveSettingStatus } from 'Common/Enums'; @@ -59,7 +59,7 @@ export class AbstractViewPopup extends AbstractView super('Popups' + name, ViewTypePopup); this.keyScope.scope = name; this.modalVisible = ko.observable(false).extend({ rateLimit: 0 }); - shortcuts.add('escape,close', '', name, () => { + addShortcut('escape,close', '', name, () => { if (this.modalVisible() && false !== this.onClose()) { this.close(); } diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index 527cd0162..f5befb43d 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.20.0. +This app packages SnappyMail 2.20.2. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index fc6783dd8..cb352237a 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.20.0 +VERSION=2.20.2 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/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 69edd9059..1d8c1703e 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -3,7 +3,7 @@ snappymail SnappyMail SnappyMail Webmail - 2.20.1 + 2.20.2 agpl SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli