diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08c855b4cd..aecd4e6ed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,47 @@
+## 2.36.0 – 2024-03-18
+
+### Added
+- Allow setting the supported THREAD algorithm
+- Icon to system folders
+- Remove remembered password after 15 minutes of inactivity
+- Swap background and text color for unreadable text on dark background
+ [#1486](https://github.com/the-djmaze/snappymail/issues/1486)
+- Generate TOTP code at ?Admin -> Security
+ [#1501](https://github.com/the-djmaze/snappymail/issues/1501)
+- Button to change S/MIME private key passphrase
+ [#1505](https://github.com/the-djmaze/snappymail/issues/1505)
+- Belarusian by @spoooyders
+ [#1512](https://github.com/the-djmaze/snappymail/pull/1512)
+- Log some domain idn_to_ascii issues
+ [#1513](https://github.com/the-djmaze/snappymail/pull/1513)
+
+### Changed
+- On folder/mailbox rename, also rename all children instead of reloading all
+- Seal MainAccount CryptKey and on error ask old login passphrase to reseal key.
+- Moved cache drivers outside core into extensions
+- Sieve always allow fileinto INBOX
+ [#1510](https://github.com/the-djmaze/snappymail/issues/1510)
+- Moved application.ini `sieve_auth_plain_initial` to per domain config
+- Languages use rfc5646, by using the shortest ISO 639 code by default
+- Update French by @hguilbert
+- Update Portuguese by @ner00
+
+### Fixed
+- On folder/mailbox rename, the old fullName must be removed from cache
+- On folder/mailbox rename, the checkable option was not renamed
+- Sort accounts drag & drop
+- S/MIME encrypted and opaque signed not visible
+ [#1450](https://github.com/the-djmaze/snappymail/issues/1450)
+- Wrong last UID of thread
+ [#1507](https://github.com/the-djmaze/snappymail/issues/1507)
+- Creation of dynamic property SnappyMail\DAV\Client::$HTTP
+ [#1509](https://github.com/the-djmaze/snappymail/issues/1509)
+- "Download as ZIP" fails for messages
+ [#1514](https://github.com/the-djmaze/snappymail/issues/1514)
+- SMTP "Authentication failed" when IMAP uses `shortLogin` and SMTP not
+ [#1517](https://github.com/the-djmaze/snappymail/issues/1517)
+
+
## 2.35.4 – 2024-03-16
### Added
@@ -6,7 +50,6 @@
### Changed
- OpenPGP.js to v5.11.1
- punycode.js lowercase domain names
-- Nextcloud changed stored password handling
- application.ini `login_lowercase` removed and now configurable per domain JSON `lowerLogin`
- Update Portuguese by @ner00
@@ -21,6 +64,11 @@
[#1500](https://github.com/the-djmaze/snappymail/issues/1500)
- VCard PHP Notice: Undefined index: ENCODING
+### Nextcloud
+- Changed stored password handling
+- Can't login from nextcloud with 2.35.3 bug Nextcloud
+ [#1490](https://github.com/the-djmaze/snappymail/issues/1490)
+
## 2.35.3 – 2024-03-12
@@ -68,6 +116,7 @@
- Crash on importing corrupt OpenPGP keys
- Crash on old browsers instead of showing error
- Ignore popups on logoutReload()
+ [#1467](https://github.com/the-djmaze/snappymail/pull/1467)
- Custom SASLMechanisms fail in IMAP when the connection is secure
[#1484](https://github.com/the-djmaze/snappymail/pull/1484)
@@ -86,7 +135,9 @@
- Drop support for gnupg PECL extension as it fails with "no passphrase" issues
- Error 352 when getting Filters
[#1455](https://github.com/the-djmaze/snappymail/issues/1455)
-- Nextcloud SetPassword(): Argument #1 must be of type SensitiveString, string given
+
+### Nextcloud
+- SetPassword(): Argument #1 must be of type SensitiveString, string given
[#1456](https://github.com/the-djmaze/snappymail/issues/1456)
diff --git a/README.md b/README.md
index e1f64010e9..e1937aa150 100644
--- a/README.md
+++ b/README.md
@@ -140,28 +140,28 @@ RainLoop 1.17 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
-|admin.js |2.170.153 | 82.845 |
-|app.js |4.207.787 | 430.201 |
+|admin.js |2.170.153 | 83.606 |
+|app.js |4.207.787 | 435.863 |
|boot.js | 868.735 | 4.147 |
|libs.js | 658.812 | 201.911 |
-|sieve.js | 0 | 84.703 |
+|sieve.js | 0 | 84.598 |
|polyfills.js | 334.608 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.240.095 | 804.092 |
+|TOTAL |8.240.095 | 810.410 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 256.831 | 40.733 | 73.606 | 13.649 | 60.877 | 12.228 |
-|app.min.js | 515.367 | 195.260 |139.456 | 66.275 |110.485 | 56.682 |
+|admin.min.js | 256.831 | 40.917 | 73.606 | 13.802 | 60.877 | 12.380 |
+|app.min.js | 515.367 | 197.447 |139.456 | 67.066 |110.485 | 57.238 |
|boot.min.js | 84.659 | 2.087 | 26.998 | 1.204 | 23.643 | 1.002 |
|libs.min.js | 584.772 | 92.482 |180.901 | 34.729 |155.182 | 31.017 |
-|sieve.min.js | 0 | 41.164 | 0 | 10.365 | 0 | 9.359 |
+|sieve.min.js | 0 | 41.093 | 0 | 10.325 | 0 | 9.327 |
|polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 |
-|TOTAL user |1.217.635 | 289.829 |358.761 |102.208 |299.485 | 88.701 |
-|TOTAL user+sieve |1.217.635 | 330.993 |358.761 |112.573 |299.485 | 98.060 |
-|TOTAL admin | 959.099 | 135.302 |292.911 | 49.582 |249.877 | 44.247 |
+|TOTAL user |1.217.635 | 292.016 |358.761 |102.999 |299.485 | 89.257 |
+|TOTAL user+sieve |1.217.635 | 333.109 |358.761 |113.324 |299.485 | 98.584 |
+|TOTAL admin | 959.099 | 135.486 |292.911 | 49.735 |249.877 | 44.399 |
-For a user it is around 69% smaller and faster than traditional RainLoop.
+For a user it is around 68% smaller and faster than traditional RainLoop.
### CSS changes
@@ -188,12 +188,12 @@ For a user it is around 69% smaller and faster than traditional RainLoop.
|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
-|app.css | 340.331 | 84.531 | 46.946 | 17.627 | 15.111 |
-|app.min.css | 274.947 | 67.906 | 39.647 | 15.544 | 13.567 |
+|app.css | 340.331 | 84.614 | 46.946 | 17.649 | 15.119 |
+|app.min.css | 274.947 | 67.984 | 39.647 | 15.560 | 13.574 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.573 | | 7.011 | 6.101 |
-|admin.min.css | | 24.689 | | 6.334 | 5.575 |
+|admin.css | | 30.531 | | 7.001 | 6.089 |
+|admin.min.css | | 24.655 | | 6.325 | 5.575 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 54ddaca718..0834e4cb35 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.35.4.
+This app packages SnappyMail 2.36.0.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 15b49d1cb8..693ae3eeb2 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.35.4
+VERSION=2.36.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/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 5605646548..37068aa25e 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
snappymail
SnappyMail
SnappyMail Webmail
- 2.35.4
+ 2.36.0
agpl
SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli