From 4ec7070ffad7fcf3b5e1e387da25cf9e6e3877f3 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 7 Nov 2022 14:19:16 +0100 Subject: [PATCH] v2.20.3 --- .../files/usr/local/include/application.ini | 2 +- CHANGELOG.md | 24 ++++++++++++------- build/plugins.php | 2 +- dev/Common/Html.js | 6 ++--- integrations/cloudron/DESCRIPTION.md | 2 +- integrations/cloudron/Dockerfile | 2 +- .../nextcloud/snappymail/appinfo/info.xml | 2 +- integrations/virtualmin/snappymail.pl | 2 +- package.json | 2 +- .../Views/Admin/AdminSettingsAbout.html | 1 + 10 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 03c12d1ff..8bdbe1e38 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.2" +current = "2.20.3" saved = "Fri, 30 Sep 2022 12:34:56 +0000" diff --git a/CHANGELOG.md b/CHANGELOG.md index bb9e1fa1a..792af7a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,26 @@ -## 2.20.2 – 2022-11-05 +## 2.20.3 – 2022-11-07 ### Added -- Add more search operators (i.e. copy lots of Gmail ones) - [#625](https://github.com/the-djmaze/snappymail/issues/625) +- Throw decrypt errors + [#632](https://github.com/the-djmaze/snappymail/issues/632) ### Changed -- Some CSS borders to var(--border-color) +- Better multiple WYSIWYG registration system (not finished) +- Better handling of admin token cookie ### 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) +- Cookie “name” has been rejected because it is already expired. + [#636](https://github.com/the-djmaze/snappymail/issues/636) +- Content-Security-Policy 'strict-dynamic' was missing ### Nextcloud -- auto login mechanism not working anymore - [#627](https://github.com/the-djmaze/snappymail/issues/627) +- Better handling of Content-Security-Policy + [#631](https://github.com/the-djmaze/snappymail/issues/631) + [#633](https://github.com/the-djmaze/snappymail/issues/633) +- Nextcloud 23 Error Call to undefined method useStrictDynamic() + [#634](https://github.com/the-djmaze/snappymail/issues/634) +- Use snappymail icon as favicon-mask.svg instead default nextcloud logo + [#635](https://github.com/the-djmaze/snappymail/issues/635) ## 2.20.1 – 2022-11-04 diff --git a/build/plugins.php b/build/plugins.php index d66079baf..ba6480c57 100755 --- a/build/plugins.php +++ b/build/plugins.php @@ -85,6 +85,6 @@ $manifest = str_replace('"}', "\"\n\t}", $manifest); $manifest = str_replace('}]', "}\n]", $manifest); $manifest = str_replace('","', "\",\n\t\t\"", $manifest); $manifest = str_replace('\/', '/', $manifest); -file_put_contents(PLUGINS_DEST_DIR . "/packages.json", $manifest); +file_put_contents(dirname(PLUGINS_DEST_DIR) . "/packages.json", $manifest); exit; diff --git a/dev/Common/Html.js b/dev/Common/Html.js index 568ba678e..2ffa1edf4 100644 --- a/dev/Common/Html.js +++ b/dev/Common/Html.js @@ -634,9 +634,9 @@ export class HtmlEditor { onReady = onReady ? [onReady] : []; this.onReady = fn => onReady.push(fn); // TODO: make 'which' user configurable - const which = 'CKEditor4', - wysiwyg = WYSIWYGS.find(item => which == item[0]) - || WYSIWYGS.find(item => 'Squire' == item[0]); +// const which = 'CKEditor4', +// wysiwyg = WYSIWYGS.find(item => which == item[0]) || WYSIWYGS.find(item => 'Squire' == item[0]); + const wysiwyg = WYSIWYGS.find(item => 'Squire' == item[0]); wysiwyg[1](this, element, editor => { this.editor = editor; editor.on('blur', () => this.blurTrigger()); diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index f5befb43d..82c3472e8 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.20.2. +This app packages SnappyMail 2.20.3. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index cb352237a..85f2fbab2 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.2 +VERSION=2.20.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 1d8c1703e..366252239 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.2 + 2.20.3 agpl SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli +
✔