From f22d6beb2884a47944833945c1802b31861cf9ce Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 22 May 2017 14:41:08 -0600 Subject: [PATCH] Prepare for release --- CHANGELOG.md | 7 ++++--- composer.lock | 24 ++++++++++++------------ system/defines.php | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64f2044ff4..8794e39857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ # v1.3.0-rc.3 -## 05/xx/2017 +## 05/22/2017 1. [](#new) - * Added `Utils::getPagePathFromToken()` method which is shared in Admin, Forms, etc. + * Added new unified `Utils::getPagePathFromToken()` method which is used by various plugins (Admin, Forms, Downloads, etc.) 1. [](#improved) * Optionally remove unpublished pages from the translated languages, move into untranslated list [#1482](https://github.com/getgrav/grav/pull/1482) - * Improved reliability of `hash` filecheck method + * Improved reliability of `hash` file-check method 1. [](#bugfix) + * Updated to latest Toolbox library to fix issue with some blueprints rendering in admin plugin [#1117](https://github.com/getgrav/grav-plugin-admin/issues/1117) * Fix output handling in RenderProcessor [#1483](https://github.com/getgrav/grav/pull/1483) # v1.3.0-rc.2 diff --git a/composer.lock b/composer.lock index 0f4f0883f7..7be739bb21 100644 --- a/composer.lock +++ b/composer.lock @@ -925,16 +925,16 @@ }, { "name": "rockettheme/toolbox", - "version": "1.3.4", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/rockettheme/toolbox.git", - "reference": "416b854c0c3743a1a69edfa685b7bf7514bc1f93" + "reference": "1be0986127007c9691345729607f94ba0e8a5120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/416b854c0c3743a1a69edfa685b7bf7514bc1f93", - "reference": "416b854c0c3743a1a69edfa685b7bf7514bc1f93", + "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/1be0986127007c9691345729607f94ba0e8a5120", + "reference": "1be0986127007c9691345729607f94ba0e8a5120", "shasum": "" }, "require": { @@ -969,7 +969,7 @@ "php", "rockettheme" ], - "time": "2017-05-15T17:46:25+00:00" + "time": "2017-05-22T13:09:53+00:00" }, { "name": "seld/cli-prompt", @@ -2682,23 +2682,23 @@ }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -2730,7 +2730,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", diff --git a/system/defines.php b/system/defines.php index bca0335536..efe34664cc 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.3.0-rc.2'); +define('GRAV_VERSION', '1.3.0-rc.3'); define('GRAV_TESTING', true); define('DS', '/');