From 8d6eb96c8fa030dbe2fb24ea9cb89faaca7e08c0 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 9 Feb 2023 10:37:43 +0100
Subject: [PATCH] v2.25.5
---
.../files/usr/local/include/application.ini | 2 +-
CHANGELOG.md | 39 +++++++++++++++++++
README.md | 18 ++++-----
integrations/cloudron/DESCRIPTION.md | 2 +-
integrations/cloudron/Dockerfile | 2 +-
.../nextcloud/snappymail/appinfo/info.xml | 2 +-
integrations/virtualmin/snappymail.pl | 2 +-
package.json | 2 +-
plugins/login-override/index.php | 4 +-
9 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index c554d5a28..f28bfa436 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.4"
+current = "2.25.5"
saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b3a2da9a..96dc74288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,42 @@
+## 2.25.5 – 2023-02-09
+
+## Added
+- New dark themes by @TheCuteFoxxy
+ [#925](https://github.com/the-djmaze/snappymail/pull/925)
+- External images option 'Always when DKIM is valid' for
+ [#201](https://github.com/the-djmaze/snappymail/pull/201)
+- Image whitelist menu on message for
+ [#201](https://github.com/the-djmaze/snappymail/pull/201)
+
+## Changed
+- pt-PT translation by @ner00
+ [#917](https://github.com/the-djmaze/snappymail/pull/917) and
+ [#920](https://github.com/the-djmaze/snappymail/pull/920)
+- fr-FR translation by @hguilbert
+ [#919](https://github.com/the-djmaze/snappymail/pull/919)
+- Layout section rl-right now is `display: flex` and solves
+ [#928](https://github.com/the-djmaze/snappymail/pull/928)
+- Some Themes background to `cover`
+ [#918](https://github.com/the-djmaze/snappymail/pull/918)
+- Speedup cleanHtml() parser
+- Reduce memory usage on addressbook import
+
+## Fixed
+- Prevent loading loop between MessageList and FolderInformation requests
+- Admin -> Config layout
+- Inline images sometimes failed
+- Undefined index: cid
+ [#921](https://github.com/the-djmaze/snappymail/pull/921)
+- On upgrade prevent Apache access errors for
+ [#358](https://github.com/the-djmaze/snappymail/pull/358)
+- Import contacts as CSV is broken
+ [#931](https://github.com/the-djmaze/snappymail/pull/931)
+
+### Removed
+- Blockquote height calculator for
+ [#902](https://github.com/the-djmaze/snappymail/pull/902)
+
+
## 2.25.4 – 2023-02-06
## Added
diff --git a/README.md b/README.md
index fc5751bfe..4e7d63ca6 100644
--- a/README.md
+++ b/README.md
@@ -142,24 +142,24 @@ RainLoop 1.17 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
|admin.js |2.170.153 | 81.589 |
-|app.js |4.207.787 | 415.987 |
+|app.js |4.207.787 | 416.123 |
|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 | 778.561 |
+|TOTAL |8.240.095 | 778.697 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
|admin.min.js | 256.831 | 40.319 | 73.606 | 13.343 | 60.877 | 11.970 |
-|app.min.js | 515.367 | 191.740 |139.456 | 64.135 |110.485 | 54.920 |
+|app.min.js | 515.367 | 191.764 |139.456 | 64.128 |110.485 | 54.852 |
|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.774 |358.761 | 98.968 |299.485 | 86.070 |
-|TOTAL user+sieve |1.217.635 | 326.340 |358.761 |109.395 |299.485 | 95.483 |
+|TOTAL user |1.217.635 | 284.798 |358.761 | 98.961 |299.485 | 86.002 |
+|TOTAL user+sieve |1.217.635 | 326.364 |358.761 |109.388 |299.485 | 95.415 |
|TOTAL admin | 959.099 | 133.353 |292.911 | 48.176 |249.877 | 43.120 |
For a user its around 70% smaller and faster than traditional RainLoop.
@@ -189,12 +189,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.190 | 46.946 | 17.063 | 14.669 |
-|app.min.css | 274.947 | 66.363 | 39.647 | 15.092 | 13.246 |
+|app.css | 340.331 | 81.923 | 46.946 | 17.033 | 14.647 |
+|app.min.css | 274.947 | 66.171 | 39.647 | 15.062 | 13.240 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.535 | | 6.980 | 6.091 |
-|admin.min.css | | 24.733 | | 6.336 | 5.587 |
+|admin.css | | 30.540 | | 6.984 | 6.093 |
+|admin.min.css | | 24.738 | | 6.340 | 5.589 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 00c49049c..c656b295f 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.25.4.
+This app packages SnappyMail 2.25.5.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index cf81c0aaa..41bb1de48 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.4
+VERSION=2.25.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/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 9a18b5360..fcaaad583 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.4
+ 2.25.5
agpl
SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli