Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/getgrav/grav into featur…
Browse files Browse the repository at this point in the history
…e/debug-json

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
mahagr committed May 24, 2017
2 parents 7ca0f87 + f22d6be commit 6ffc062
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 17 deletions.
14 changes: 10 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# v1.3.0-rc.4
## mm/dd/2017

1. [](#improved)
* Make it possible to include debug bar also into non-HTML responses

# 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
* Make it possible to include debug bar also into non-HTML responses
* 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
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -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', '/');

Expand Down

0 comments on commit 6ffc062

Please sign in to comment.