diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 4295578156..b9616e7c2a 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,3 +1,8 @@ +# 4.7.6.1 +- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both. +- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers +- Docker build gave a cURL error whenever it runs PHP commands. + # 4.7.6 - [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB. - [Issue 306](https://github.com/firefly-iii/firefly-iii/issues/306) You can now add liabilities to Firefly III. diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 8f55d0c5d9..48086f1f98 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -16,7 +16,7 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), appVersion = 16, - appMarketingVersion = (defaultText = "4.7.6"), + appMarketingVersion = (defaultText = "4.7.6.1"), actions = [ # Define your "new document" handlers here. diff --git a/changelog.md b/changelog.md index 5a72e59812..72d27723e4 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). + +## [4.7.6.1] - 2018-09-02 +### Fixed +- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both. +- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers +- Docker build gave a cURL error whenever it runs PHP commands. + ## [4.7.6] - 2018-09-02 ### Added - [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB. diff --git a/composer.lock b/composer.lock index 416c0a5e1a..2bed9883f1 100644 --- a/composer.lock +++ b/composer.lock @@ -1022,16 +1022,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.35", + "version": "v5.6.37", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe" + "reference": "975e182d42403b0efdf847c05f6bfb99144f95f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/02abbe2091404ebe032a6d5a83075031b7072ebe", - "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe", + "url": "https://api.github.com/repos/laravel/framework/zipball/975e182d42403b0efdf847c05f6bfb99144f95f5", + "reference": "975e182d42403b0efdf847c05f6bfb99144f95f5", "shasum": "" }, "require": { @@ -1157,7 +1157,7 @@ "framework", "laravel" ], - "time": "2018-08-27T13:18:24+00:00" + "time": "2018-09-02T13:51:42+00:00" }, { "name": "laravel/passport", diff --git a/config/firefly.php b/config/firefly.php index c182081c1e..d9b9eecde1 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -88,7 +88,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.6', + 'version' => '4.7.6.1', 'api_version' => '0.7', 'db_version' => 4, 'maxUploadSize' => 15242880,