From b7cb990b009fd1a66063bc54dbbc7ebe9159bfc7 Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 28 Jul 2021 16:11:59 +0200 Subject: [PATCH] v2.6.0 --- .tx/config | 15 ----------- README.md | 26 +++++++++---------- integrations/nextcloud/snappymail/VERSION | 2 +- .../nextcloud/snappymail/appinfo/info.xml | 4 +-- package.json | 2 +- plugins/two-factor-auth/index.php | 4 +-- .../0.0.0/app/libraries/RainLoop/Service.php | 2 +- 7 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 .tx/config diff --git a/.tx/config b/.tx/config deleted file mode 100644 index 998d92cbb7..0000000000 --- a/.tx/config +++ /dev/null @@ -1,15 +0,0 @@ -[main] -host = https://www.transifex.com -minimum_perc = 60 -type = YAML - -[snappymail-webmail.snappymail-webmail] -file_filter = snappymail/v/0.0.0/app/localization/webmail/.yml -source_file = snappymail/v/0.0.0/app/localization/webmail/_source.en.yml -source_lang = en - -[snappymail-webmail.snappymail-admin] -file_filter = snappymail/v/0.0.0/app/localization/admin/.yml -source_file = snappymail/v/0.0.0/app/localization/admin/_source.en.yml -source_lang = en - diff --git a/README.md b/README.md index cb1d14d865..9364b21581 100644 --- a/README.md +++ b/README.md @@ -81,11 +81,11 @@ This fork of RainLoop has the following changes: This fork uses downsized/simplified versions of scripts and has no support for Internet Explorer nor Edge Legacy. Supported are: -* Chrome 69 -* Edge 79 -* Firefox 69 -* Opera 56 -* Safari 12 +* Chrome 69+ +* Edge 79+ +* Firefox 69+ +* Opera 56+ +* Safari 12+ ### Removal of old JavaScript @@ -130,23 +130,23 @@ RainLoop 1.15 vs SnappyMail |--------------- |--------: |--------: | |admin.js |2.158.025 | 91.598 | |app.js |4.215.733 | 454.046 | -|boot.js | 672.433 | 3.147 | -|libs.js | 647.679 | 218.139 | +|boot.js | 672.433 | 2.861 | +|libs.js | 647.679 | 217.881 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 767.215 | +|TOTAL |8.019.778 | 766.671 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | |admin.min.js | 255.514 | 47.631 | 73.899 | 14.320 | 60.674 | 12.796 | |app.min.js | 516.000 | 233.722 |140.430 | 68.676 |110.657 | 58.037 | -|boot.min.js | 66.456 | 1.751 | 22.553 | 1.025 | 20.043 | 858 | -|libs.min.js | 574.626 | 106.273 |177.280 | 38.502 |151.855 | 34.428 | +|boot.min.js | 66.456 | 1.621 | 22.553 | 968 | 20.043 | 810 | +|libs.min.js | 574.626 | 106.182 |177.280 | 38.479 |151.855 | 34.497 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL |1.445.204 | 389.377 |425.477 |122.523 |353.301 |106.119 | -|TOTAL (no admin) |1.189.690 | 341.746 |351.061 |108.203 |292.627 | 93.323 | +|TOTAL |1.445.204 | 389.156 |425.477 |122.443 |353.301 |106.140 | +|TOTAL (no admin) |1.189.690 | 341.525 |351.061 |108.123 |292.627 | 93.344 | -For a user its around 69% smaller and faster than traditional RainLoop. +For a user its around 68% smaller and faster than traditional RainLoop. |OpenPGP |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION index aedc15bb0c..e70b4523ae 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.5.3 +2.6.0 diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 2a4072d162..7c51cf70ec 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -3,8 +3,8 @@ snappymail 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.5.3 (2021-07). - 2.5.3 + 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.6.0 agpl SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli SnappyMail diff --git a/package.json b/package.json index 3914c9a467..549a6bff1e 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.5.3", + "version": "2.6.0", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php index c9e1f4e29c..162aeb0a6f 100644 --- a/plugins/two-factor-auth/index.php +++ b/plugins/two-factor-auth/index.php @@ -7,8 +7,8 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin const NAME = 'Two Factor Authentication', VERSION = '2.1', - RELEASE = '2021-07-22', - REQUIRED = '2.5.4', + RELEASE = '2021-07-28', + REQUIRED = '2.6.0', CATEGORY = 'Login', DESCRIPTION = 'This plugin allows you to have TOTP 2FA'; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php index da6e351f95..a953bcaf43 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php @@ -203,7 +203,7 @@ private function setCSP(string $sScriptNonce = null) : void $sContentSecurityPolicy = \preg_replace('/(img-src[^;]+)\\shttp:(\\s|;|$)/D', '$1$2', $sContentSecurityPolicy); } // Internet Explorer does not support 'nonce' - if (!\strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/')) { + if (!\strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/') && !\strpos($_SERVER['HTTP_USER_AGENT'], 'Edge/1')) { if ($sScriptNonce) { $sContentSecurityPolicy = \preg_replace("/(script-src[^;]+)'unsafe-inline'/", "\$1'nonce-{$sScriptNonce}'", $sContentSecurityPolicy); }