From fecbdc7fbf40d2a56085208d7822f83ba8f6f5ec Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 1 Nov 2016 18:44:26 +0100 Subject: [PATCH] New version. Signed-off-by: James Cole --- CHANGELOG.md | 9 +++++++++ composer.lock | 35 +++++++++++++++-------------------- config/firefly.php | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aad0bb631..ac1c4e09df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.1.5] - 2016-11-01 +### Changed +- Report parts are loaded using AJAX, making a lot of code more simple. +- Help content will fall back to English. +- Help content is translated through Crowdin. + +### Fixed +- Issue #370 + ## [4.1.4] - 2016-10-30 ### Added - New Dockerfile thanks to @schoentoon diff --git a/composer.lock b/composer.lock index a87c3c8e96..2e8a6bc01f 100644 --- a/composer.lock +++ b/composer.lock @@ -3117,16 +3117,16 @@ }, { "name": "watson/validating", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/dwightwatson/validating.git", - "reference": "8ae5915976ddc152da54efcc03240d17370a60c3" + "reference": "3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/8ae5915976ddc152da54efcc03240d17370a60c3", - "reference": "8ae5915976ddc152da54efcc03240d17370a60c3", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b", + "reference": "3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b", "shasum": "" }, "require": { @@ -3142,11 +3142,6 @@ "phpunit/phpunit": "~4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "Watson\\Validating\\": "src/" @@ -3168,7 +3163,7 @@ "laravel", "validation" ], - "time": "2016-08-28 13:39:22" + "time": "2016-10-31 21:53:17" } ], "packages-dev": [ @@ -3386,16 +3381,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.5.4", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f" + "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f", - "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/399c1f9781e222f6eb6cc238796f5200d1b7f108", + "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108", "shasum": "" }, "require": { @@ -3424,7 +3419,7 @@ "object", "object graph" ], - "time": "2016-09-16 13:37:59" + "time": "2016-10-31 17:19:45" }, { "name": "phpdocumentor/reflection-common", @@ -3636,16 +3631,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3" + "reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5f3f7e736d6319d5f1fc402aff8b026da26709a3", - "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6cba06ff75a1a63a71033e1a01b89056f3af1e8d", + "reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d", "shasum": "" }, "require": { @@ -3695,7 +3690,7 @@ "testing", "xunit" ], - "time": "2016-07-26 14:39:29" + "time": "2016-11-01 05:06:24" }, { "name": "phpunit/php-file-iterator", diff --git a/config/firefly.php b/config/firefly.php index 69b5e13029..97b843110a 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -22,7 +22,7 @@ return [ 'single_user_mode' => true, ], 'chart' => 'chartjs', - 'version' => '4.1.4', + 'version' => '4.1.5', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],