diff --git a/README.md b/README.md index 05524f113..7b7853052 100644 --- a/README.md +++ b/README.md @@ -129,23 +129,23 @@ RainLoop 1.15 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.158.025 | 91.665 | -|app.js |4.215.733 | 453.963 | +|admin.js |2.158.025 | 91.050 | +|app.js |4.215.733 | 451.709 | |boot.js | 672.433 | 2.861 | -|libs.js | 647.679 | 216.856 | +|libs.js | 647.679 | 214.458 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 765.598 | +|TOTAL |8.019.778 | 760.363 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 255.514 | 47.675 | 73.899 | 14.346 | 60.674 | 12.816 | -|app.min.js | 516.000 | 233.723 |140.430 | 68.684 |110.657 | 58.080 | +|admin.min.js | 255.514 | 47.330 | 73.899 | 14.216 | 60.674 | 12.715 | +|app.min.js | 516.000 | 232.217 |140.430 | 68.323 |110.657 | 57.830 | |boot.min.js | 66.456 | 1.621 | 22.553 | 968 | 20.043 | 810 | -|libs.min.js | 574.626 | 105.192 |177.280 | 38.128 |151.855 | 34.188 | +|libs.min.js | 574.626 | 103.928 |177.280 | 37.795 |151.855 | 33.829 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL |1.445.204 | 388.211 |425.477 |122.126 |353.301 |105.894 | -|TOTAL (no admin) |1.189.690 | 340.536 |351.061 |107.780 |292.627 | 93.078 | +|TOTAL |1.445.204 | 385.096 |425.477 |121.302 |353.301 |105.184 | +|TOTAL (no admin) |1.189.690 | 337.766 |351.061 |107.086 |292.627 | 92.469 | For a user its around 68% smaller and faster than traditional RainLoop. @@ -184,12 +184,12 @@ For a user its around 68% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |------: |------: |------: |--------: | -|app.css | 340.334 | 97.272 | 46,959 | 17.692 | 15.260 | -|app.min.css | 274.791 | 79.365 | 39.618 | 15.822 | 13.926 | +|app.css | 340.334 | 96.105 | 46,959 | 17.510 | 15.104 | +|app.min.css | 274.791 | 78.371 | 39.618 | 15.671 | 13.804 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 40.359 | | 8.468 | 7.396 | -|admin.min.css | | 31.591 | | 7.429 | 6.600 | +|admin.css | | 40.198 | | 8.442 | 7.371 | +|admin.min.css | | 31.756 | | 7.401 | 6.572 | ### Squire vs CKEditor diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION index e70b4523a..d5724cd41 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.6.0 +2.6.2 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 7c51cf70e..01f8c0d7f 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -4,7 +4,7 @@ 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.6.0 (2021-07). - 2.6.0 + 2.6.2 agpl SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli SnappyMail diff --git a/package.json b/package.json index 5c0dd40c5..ca78d260b 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.6.1", + "version": "2.6.2", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/plugins/ckeditor/index.php b/plugins/ckeditor/index.php index a5a0c5c6d..f885cd5cd 100644 --- a/plugins/ckeditor/index.php +++ b/plugins/ckeditor/index.php @@ -4,9 +4,9 @@ class CKEditorPlugin extends \RainLoop\Plugins\AbstractPlugin { const NAME = 'CKEditor', - VERSION = '2.1', - RELEASE = '2021-04-19', - REQUIRED = '2.5.0', + VERSION = '2.2', + RELEASE = '2021-08-17', + REQUIRED = '2.6.2', DESCRIPTION = 'Use CKEditor instead of Squire as WYSIWYG'; public function Init() : void diff --git a/release.php b/release.php index dd615edd6..58bedbf0b 100755 --- a/release.php +++ b/release.php @@ -100,6 +100,13 @@ $options['docker'] = isset($options['docker']) || (!$options['aur'] && $docker & $package = json_decode(file_get_contents('package.json')); +// Update files that contain version +file_put_contents(__DIR__ . '/integrations/nextcloud/snappymail/VERSION', $package->version); +$file = __DIR__ . '/integrations/nextcloud/snappymail/appinfo/info.xml'; +file_put_contents($file, preg_replace('/[^<]*{$package->version}<", file_get_contents($file))); +$file = __DIR__ . '/arch/PKGBUILD'; +file_put_contents($file, preg_replace('/pkgver=[0-9.]+/', "pkgver={$package->version}", file_get_contents($file))); + $destPath = "build/dist/releases/webmail/{$package->version}/"; is_dir($destPath) || mkdir($destPath, 0777, true);