From 8c676aa267e965908c826787f361abe30e2e46b5 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 3 Feb 2023 15:15:49 +0100
Subject: [PATCH] v2.25.3
---
.../files/usr/local/include/application.ini | 2 +-
CHANGELOG.md | 28 +++++++++++++++++++
README.md | 16 +++++------
integrations/cloudron/DESCRIPTION.md | 2 +-
integrations/cloudron/Dockerfile | 2 +-
.../nextcloud/snappymail/appinfo/info.xml | 2 +-
integrations/virtualmin/snappymail.pl | 2 +-
package.json | 2 +-
8 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 64ba42825..671e0ebd0 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -316,5 +316,5 @@ dev_email = ""
dev_password = ""
[version]
-current = "2.25.2"
+current = "2.25.3"
saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cc971351..68ed1bf0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.25.3 – 2023-02-03
+
+## Added
+- Make message collapse quotes optional
+ [#902](https://github.com/the-djmaze/snappymail/pull/902)
+
+## Changed
+- Improved loginErrorDelay to prevent timing attacks and default to 5 seconds
+- Moved message collapse quotes to HTML parser
+- Moved some application.ini settings to other sections
+- Moved source "/assets/*" to proper location in /snappymail/v/0.0.0/static/
+- Set checkMailInterval to 15 minutes by default (now that it is configurable)
+
+## Fixed
+- Prevent plugin property decrypt error
+ [#859](https://github.com/the-djmaze/snappymail/pull/859)
+- Index.html cache issue
+ [#891](https://github.com/the-djmaze/snappymail/pull/891)
+- Images whitelist regular expression failed
+ [#201](https://github.com/the-djmaze/snappymail/pull/201)
+- Undefined index: ShowImages
+ [#901](https://github.com/the-djmaze/snappymail/pull/901)
+- Chrome shows LSep boxes in certain emails
+ [#900](https://github.com/the-djmaze/snappymail/pull/900)
+- Don't remember OpenPGP/GnuPGP key passphrase when it fails
+ [#840](https://github.com/the-djmaze/snappymail/pull/840)
+
+
## 2.25.2 – 2023-02-02
## Added
diff --git a/README.md b/README.md
index ef2c90b34..fb2461a37 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ And don't forget to read the [RainLoop documentation](https://www.rainloop.net/d
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
http://www.gnu.org/licenses/agpl-3.0.html
-Copyright (c) 2020 - 2022 SnappyMail
+Copyright (c) 2020 - 2023 SnappyMail
Copyright (c) 2013 - 2022 RainLoop
## Modifications
@@ -142,24 +142,24 @@ RainLoop 1.17 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
|admin.js |2.170.153 | 81.572 |
-|app.js |4.207.787 | 414.740 |
+|app.js |4.207.787 | 415.364 |
|boot.js | 868.735 | 2.711 |
|libs.js | 658.812 | 192.392 |
|sieve.js | 0 | 85.597 |
|polyfills.js | 334.608 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.240.095 | 777.297 |
+|TOTAL |8.240.095 | 777.921 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
|admin.min.js | 256.831 | 40.301 | 73.606 | 13.336 | 60.877 | 11.973 |
-|app.min.js | 515.367 | 191.250 |139.456 | 63.920 |110.485 | 54.737 |
+|app.min.js | 515.367 | 191.465 |139.456 | 64.051 |110.485 | 54.830 |
|boot.min.js | 84.659 | 1.600 | 26.998 | 940 | 23.643 | 767 |
|libs.min.js | 584.772 | 91.434 |180.901 | 33.893 |155.182 | 30.383 |
|sieve.min.js | 0 | 41.566 | 0 | 10.427 | 0 | 9.413 |
|polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 |
-|TOTAL user |1.217.635 | 284.284 |358.761 | 98.753 |299.485 | 85.887 |
-|TOTAL user+sieve |1.217.635 | 325.850 |358.761 |109.180 |299.485 | 95.300 |
+|TOTAL user |1.217.635 | 284.499 |358.761 | 98.884 |299.485 | 85.980 |
+|TOTAL user+sieve |1.217.635 | 326.065 |358.761 |109.311 |299.485 | 95.393 |
|TOTAL admin | 959.099 | 133.335 |292.911 | 48.169 |249.877 | 43.123 |
For a user its around 70% smaller and faster than traditional RainLoop.
@@ -193,8 +193,8 @@ For a user its around 70% smaller and faster than traditional RainLoop.
|app.min.css | 274.947 | 66.384 | 39.647 | 15.084 | 13.224 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.388 | | 6.929 | 6.020 |
-|admin.min.css | | 24.579 | | 6.255 | 5.525 |
+|admin.css | | 30.447 | | 6.973 | 6.071 |
+|admin.min.css | | 24.582 | | 6.258 | 5.526 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 8ae53714d..ec63b2385 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.25.2.
+This app packages SnappyMail 2.25.3.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index b035ea893..e043f0cf6 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.25.2
+VERSION=2.25.3
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 d6a0fda15..60ee15f19 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
snappymail
SnappyMail
SnappyMail Webmail
- 2.25.2
+ 2.25.3
agpl
SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli