From c3b4849fa01cbdb3a17db1e42650ac83d5ac3fb1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 2 Feb 2017 20:55:01 +0100 Subject: [PATCH] Various updates for upcoming release 4.3.4 --- CHANGELOG.md | 6 ++++++ composer.json | 1 - composer.lock | 40 ++++++++++++++++++++-------------------- config/firefly.php | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dc3f748c8..91120fe9b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). + +## [4.3.3] - 2017-02-02 +### Fixed +- Fixed bug #550, reported by @worldworm! +- Fixed bug #551, reported by @t-me! + ## [4.3.3] - 2017-01-30 _The 100th release of Firefly!_ diff --git a/composer.json b/composer.json index 6f7bea2597..659144ebc2 100755 --- a/composer.json +++ b/composer.json @@ -53,7 +53,6 @@ "watson/validating": "3.*", "doctrine/dbal": "^2.5", "league/commonmark": "0.15.*", - "twig/twig": "1.30.0", "rcrowe/twigbridge": "0.9.*", "league/csv": "8.*", "laravelcollective/html": "^5.3", diff --git a/composer.lock b/composer.lock index ae477e0989..b816654cd5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "db26ae145d3656fe05d8a222fc21e263", + "content-hash": "8a447ee60bb0509881af5070e5980f18", "packages": [ { "name": "bacon/bacon-qr-code", @@ -158,16 +158,16 @@ }, { "name": "davejamesmiller/laravel-breadcrumbs", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", - "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff" + "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/460bf79e83ff9e3db1e3f1c40169d8893893f8ff", - "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff", + "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/6ca5a600003ecb52a5b5af14dad82033058604e1", + "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1", "shasum": "" }, "require": { @@ -195,15 +195,15 @@ { "name": "Dave James Miller", "email": "dave@davejamesmiller.com", - "homepage": "http://davejamesmiller.com/" + "homepage": "https://davejamesmiller.com/" } ], "description": "A simple Laravel-style way to create breadcrumbs in Laravel 4+.", - "homepage": "http://laravel-breadcrumbs.davejamesmiller.com", + "homepage": "https://laravel-breadcrumbs.readthedocs.io/", "keywords": [ "laravel" ], - "time": "2016-08-28T16:57:03+00:00" + "time": "2017-01-30T21:16:53+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -1163,16 +1163,16 @@ }, { "name": "league/flysystem", - "version": "1.0.33", + "version": "1.0.34", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c" + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5c7f98498b12d47f9de90ec9186a90000125777c", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299", + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299", "shasum": "" }, "require": { @@ -1242,7 +1242,7 @@ "sftp", "storage" ], - "time": "2017-01-23T10:32:09+00:00" + "time": "2017-01-30T17:41:17+00:00" }, { "name": "monolog/monolog", @@ -2730,16 +2730,16 @@ }, { "name": "twig/twig", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "c6ff71094fde15d12398eaba029434b013dc5e59" + "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/c6ff71094fde15d12398eaba029434b013dc5e59", - "reference": "c6ff71094fde15d12398eaba029434b013dc5e59", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddc9e3e20ee9c0b6908f401ac8353635b750eca7", + "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7", "shasum": "" }, "require": { @@ -2747,12 +2747,12 @@ }, "require-dev": { "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.2@dev" + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.30-dev" + "dev-master": "1.31-dev" } }, "autoload": { @@ -2787,7 +2787,7 @@ "keywords": [ "templating" ], - "time": "2016-12-23T11:06:22+00:00" + "time": "2017-01-11T19:36:15+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/config/firefly.php b/config/firefly.php index 7d0627c636..adae9e8c07 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -24,7 +24,7 @@ return [ ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'chart' => 'chartjs', - 'version' => '4.3.3', + 'version' => '4.3.4', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],