diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 2200cbe59a..df4a9b1ed9 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,12 +1,18 @@ -# 4.6.9.1 +# 4.6.10 +- Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619) +- [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu) +- Improved Sandstorm support. +- [Issue 963](https://github.com/firefly-iii/firefly-iii/issues/963), as reported by [gavu](https://github.com/gavu) +- [Issue 970](https://github.com/firefly-iii/firefly-iii/issues/970), as reported by [gavu](https://github.com/gavu) +- [Issue 971](https://github.com/firefly-iii/firefly-iii/issues/971), as reported by [gavu](https://github.com/gavu) +- Various Sandstorm.io related issues. -* Updated license -* Updated file list +# 4.6.9.1 +- Updated license +- Updated file list # 4.6.9 - -* First version that works! +- First version that works! # 3.4.3 - -* Initial release on Sandstorm.io \ No newline at end of file +- Initial release on Sandstorm.io \ No newline at end of file diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 8e6c383ae0..158e0b088e 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 1, - appMarketingVersion = (defaultText = "4.6.9.1"), + appVersion = 2, + appMarketingVersion = (defaultText = "4.6.10"), actions = [ # Define your "new document" handlers here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 351497fae6..316ac51876 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.6.10] - 2017-11-xx +### Added +- Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619) +- [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu) + +### Changed +- Improved Sandstorm support. + +### Fixed +- [Issue 963](https://github.com/firefly-iii/firefly-iii/issues/963), as reported by [gavu](https://github.com/gavu) +- [Issue 970](https://github.com/firefly-iii/firefly-iii/issues/970), as reported by [gavu](https://github.com/gavu) +- [Issue 971](https://github.com/firefly-iii/firefly-iii/issues/971), as reported by [gavu](https://github.com/gavu) +- Various Sandstorm.io related issues. + ## [4.6.9] - 2017-10-22 ### Added - Firefly III is now available on the [Sandstorm.io](https://apps.sandstorm.io/app/uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70) market. diff --git a/composer.lock b/composer.lock index 3aa3036e3b..aefd8fccb3 100644 --- a/composer.lock +++ b/composer.lock @@ -1271,7 +1271,7 @@ }, { "name": "mtdowling/cron-expression", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/mtdowling/cron-expression.git", diff --git a/config/firefly.php b/config/firefly.php index 0d8fb66aba..8ca8c90385 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -33,7 +33,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'version' => '4.6.9', + 'version' => '4.6.10', 'maxUploadSize' => 15242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], 'list_length' => 10,