From 7b6603719e6d40635a966742c4f74460b4c917a4 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Fri, 7 Oct 2022 13:17:50 +0200 Subject: [PATCH] v2.18.5 --- .../files/usr/local/include/application.ini | 2 +- README.md | 22 +++++++++---------- dev/Stores/User/Folder.js | 3 ++- integrations/cloudron/DESCRIPTION.md | 2 +- integrations/cloudron/Dockerfile | 2 +- integrations/nextcloud/snappymail/VERSION | 2 +- .../nextcloud/snappymail/appinfo/info.xml | 2 +- integrations/virtualmin/snappymail.pl | 2 +- package.json | 2 +- .../Views/User/SettingsFolderItem.html | 8 +++---- 10 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index c6c50ad94..bc92ee085 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -298,5 +298,5 @@ dev_email = "" dev_password = "" [version] -current = "2.18.4" +current = "2.18.5" saved = "Fri, 30 Sep 2022 12:34:56 +0000" diff --git a/README.md b/README.md index f5dce6d48..72bdeb37f 100644 --- a/README.md +++ b/README.md @@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.170.153 | 80.818 | -|app.js |4.207.787 | 403.757 | +|admin.js |2.170.153 | 80.893 | +|app.js |4.207.787 | 405.596 | |boot.js | 868.735 | 2.050 | -|libs.js | 658.812 | 195.216 | +|libs.js | 658.812 | 195.214 | |sieve.js | 0 | 86.183 | |polyfills.js | 334.608 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.240.095 | 768.309 | +|TOTAL |8.240.095 | 770.221 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | |admin.min.js | 256.831 | 40.083 | 73.606 | 13.387 | 60.877 | 11.991 | -|app.min.js | 515.367 | 187.050 |139.456 | 61.808 |110.485 | 53.084 | +|app.min.js | 515.367 | 187.928 |139.456 | 62.162 |110.485 | 53.380 | |boot.min.js | 84.659 | 1.252 | 26.998 | 778 | 23.643 | 628 | -|libs.min.js | 584.772 | 93.432 |180.901 | 34.505 |155.182 | 30.971 | +|libs.min.js | 584.772 | 93.430 |180.901 | 34.504 |155.182 | 30.954 | |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 | 281.734 |358.761 | 97.091 |299.485 | 84.683 | -|TOTAL user+sieve |1.217.635 | 323.695 |358.761 |107.584 |299.485 | 94.145 | -|TOTAL admin | 959.099 | 134.767 |292.911 | 48.670 |249.877 | 43.590 | +|TOTAL user |1.217.635 | 282.610 |358.761 | 97.444 |299.485 | 84.962 | +|TOTAL user+sieve |1.217.635 | 324.571 |358.761 |107.937 |299.485 | 94.424 | +|TOTAL admin | 959.099 | 134.765 |292.911 | 48.669 |249.877 | 43.573 | For a user its around 70% smaller and faster than traditional RainLoop. @@ -187,8 +187,8 @@ 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.450 | 46.946 | 16.867 | 14.497 | -|app.min.css | 274.947 | 65.395 | 39.647 | 14.975 | 13.109 | +|app.css | 340.331 | 81.669 | 46.946 | 16.923 | 14.538 | +|app.min.css | 274.947 | 65.520 | 39.647 | 15.098 | 13.140 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | |admin.css | | 29.949 | | 6.793 | 5.898 | diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js index 874b54572..4d0526f89 100644 --- a/dev/Stores/User/Folder.js +++ b/dev/Stores/User/Folder.js @@ -41,7 +41,8 @@ ignoredKeywords = [ '$attachment', '$replied', // Others - '$readreceipt' + '$readreceipt', + '$notdelivered' ], isAllowedKeyword = value => '\\' != value[0] && !ignoredKeywords.includes(value.toLowerCase()), diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index 6783305d7..a6e41fc49 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.18.4. +This app packages SnappyMail 2.18.5. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 37113194d..0c2e98a4c 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.18.4 +VERSION=2.18.5 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 401b70b2e..5150594de 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.18.4 \ No newline at end of file +2.18.5 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index c69a87250..bded35fb7 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.18.4 + 2.18.5 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 912b6a36f..2b7c65425 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.18.4" ); +return ( "2.18.5" ); } sub script_snappymail_version_desc diff --git a/package.json b/package.json index d7bd53b39..2ffc1cc44 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.18.4", + "version": "2.18.5", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html index a1538fb0f..9e5357f2d 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html @@ -14,12 +14,12 @@ data-i18n="GLOBAL/ARE_YOU_SURE"> 🗑 - - 👁 + + 👁 - - + +