diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d4b4ce5..ac14a504a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.7.0-rc.4 +## mm/dd/2020 + +1. [](#bugfix) + * Grav 1.7: Fixed blueprint loading issues [#2782](https://github.com/getgrav/grav/issues/2782) + # v1.7.0-rc.3 ## 01/02/2020 diff --git a/composer.lock b/composer.lock index e095e2d3d..75943e932 100644 --- a/composer.lock +++ b/composer.lock @@ -1840,12 +1840,12 @@ "source": { "type": "git", "url": "https://github.com/rockettheme/toolbox.git", - "reference": "9cde0b2fcfbd448cf2e755774693da5f4cde199c" + "reference": "1cefb10977d73ac65eeacbca0c568196076db37e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/9cde0b2fcfbd448cf2e755774693da5f4cde199c", - "reference": "9cde0b2fcfbd448cf2e755774693da5f4cde199c", + "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/1cefb10977d73ac65eeacbca0c568196076db37e", + "reference": "1cefb10977d73ac65eeacbca0c568196076db37e", "shasum": "" }, "archive": { @@ -1903,7 +1903,7 @@ "source": "https://github.com/rockettheme/toolbox/tree/develop", "issues": "https://github.com/rockettheme/toolbox/issues" }, - "time": "2019-12-10T18:34:56+00:00" + "time": "2020-01-06T11:35:41+00:00" }, { "name": "seld/cli-prompt", @@ -3572,20 +3572,20 @@ }, { "name": "nette/finder", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/nette/finder.git", - "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe" + "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/14164e1ddd69e9c5f627ff82a10874b3f5bba5fe", - "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe", + "url": "https://api.github.com/repos/nette/finder/zipball/4ad2c298eb8c687dd0e74ae84206a4186eeaed50", + "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50", "shasum": "" }, "require": { - "nette/utils": "^2.4 || ~3.0.0", + "nette/utils": "^2.4 || ^3.0", "php": ">=7.1" }, "conflict": { @@ -3593,6 +3593,7 @@ }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -3630,7 +3631,7 @@ "iterator", "nette" ], - "time": "2019-07-11T18:02:17+00:00" + "time": "2020-01-03T20:35:40+00:00" }, { "name": "nette/neon", @@ -3696,24 +3697,25 @@ }, { "name": "nette/php-generator", - "version": "v3.3.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187" + "reference": "facde285ba959366e7eee09c7f198f2d9ef176ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/4240fd7adf499138c07b814ef9b9a6df9f6d7187", - "reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187", + "url": "https://api.github.com/repos/nette/php-generator/zipball/facde285ba959366e7eee09c7f198f2d9ef176ca", + "reference": "facde285ba959366e7eee09c7f198f2d9ef176ca", "shasum": "" }, "require": { - "nette/utils": "^2.4.2 || ~3.0.0", + "nette/utils": "^2.4.2 || ^3.0", "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -3743,7 +3745,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.3 features.", + "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.4 features.", "homepage": "https://nette.org", "keywords": [ "code", @@ -3751,7 +3753,7 @@ "php", "scaffolding" ], - "time": "2019-11-22T11:12:11+00:00" + "time": "2020-01-03T19:49:13+00:00" }, { "name": "nette/robot-loader", @@ -3875,16 +3877,16 @@ }, { "name": "nette/utils", - "version": "v3.0.3", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e" + "reference": "d6cd63d77dd9a85c3a2fae707e1255e44c2bc182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e", - "reference": "f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e", + "url": "https://api.github.com/repos/nette/utils/zipball/d6cd63d77dd9a85c3a2fae707e1255e44c2bc182", + "reference": "d6cd63d77dd9a85c3a2fae707e1255e44c2bc182", "shasum": "" }, "require": { @@ -3907,7 +3909,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -3949,7 +3951,7 @@ "utility", "validation" ], - "time": "2019-12-27T03:47:50+00:00" + "time": "2020-01-03T18:13:31+00:00" }, { "name": "nikic/php-parser",