diff --git a/.travis.yml b/.travis.yml index 56943a340a..7c543eac51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ env: - GOPATH="$HOME/go" - PATH="$GOPATH/bin:$PATH" # GH_TOKEN [API Key] - - secure: "jS+c+g2v33vypG4VtqiSDW2qQ4dGJZlrUKBRCztoy1yrOrYRPvc5Vzi/AS3fDmZ4yizukEwmUNNzyZQcgFvLPpmCCml46Dovp8R9OXhbNe8OnULmaSn2Zkr71oblMYu6ZP+RpYvNq0BIdSB3u2TiFriHMiTIkX9UwZNaUCOX1ig=" + - secure: "NR9pV7YteY9OoPmjDTQG0fDfocVu+tCeiDH1F2GFhXCu71UOIvqWXpOxp0RHkG5GIXdCFHx59yu+ZO275lbaHkbF8+4lVSVrV4RcGn+pIncvxr6iZCVW05dbAxV3H8alK+xYJRGmbyfQl5wIM49WvmuGHZjcmIloS4t/omQ3N+I=" # BB_TOKEN value => "user:pass@" - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k=" # GH_API_USER [for curl] diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a2a82bdcf..f48af8866a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,22 @@ 1. [](#improved) * Make it possible to include debug bar also into non-HTML responses +# v1.3.1 +## 07/xx/2017 + +1. [](#bugfix) + * Check if medium thumbnail exists before resetting + +# v1.3.0 +## 07/16/2017 + +1. [](#bugfix) + * Fixed an undefined variable `$difference` [#1563](https://github.com/getgrav/grav/pull/1563) + * Fix broken range slider [grav-plugin-admin#1153](https://github.com/getgrav/grav-plugin-admin/issues/1153) + * Fix natural sort when > 100 pages [#1564](https://github.com/getgrav/grav/pull/1564) + # v1.3.0-rc.5 -## xx/xx/2017 +## 07/05/2017 1. [](#new) * Setting `system.session.timeout` to 0 clears the session when the browser session ends [#1538](https://github.com/getgrav/grav/pull/1538) diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml index 613677a885..c9b959e864 100644 --- a/system/blueprints/config/system.yaml +++ b/system/blueprints/config/system.yaml @@ -862,7 +862,6 @@ form: append: '%' label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP - classes: x-small validate: min: 1 max: 100 diff --git a/system/defines.php b/system/defines.php index 1790458486..f014a65b91 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,8 +8,8 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.3.0-rc.4'); -define('GRAV_TESTING', true); +define('GRAV_VERSION', '1.3.0'); +//define('GRAV_TESTING', true); define('DS', '/'); if (!defined('GRAV_PHP_MIN')) { diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php index d63f12ed71..e817375b98 100644 --- a/system/src/Grav/Common/Page/Medium/Medium.php +++ b/system/src/Grav/Common/Page/Medium/Medium.php @@ -367,7 +367,7 @@ public function display($mode = 'source') $this->mode = $mode; - return $mode === 'thumbnail' ? $this->getThumbnail()->reset() : $this->reset(); + return $mode === 'thumbnail' ? ($this->getThumbnail() ? $this->getThumbnail()->reset() : null) : $this->reset(); } /** diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php index ffb280f9d3..08f96fd17f 100644 --- a/system/src/Grav/Common/Page/Pages.php +++ b/system/src/Grav/Common/Page/Pages.php @@ -1257,6 +1257,12 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual $locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set $col = Collator::create($locale); if ($col) { + if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) { + $list = preg_replace_callback('~([0-9]+)\.~', function($number) { + return sprintf('%032d.', $number[0]); + }, $list); + } + $col->asort($list, $sort_flags); } else { asort($list, $sort_flags); diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index f9c98ba915..908b5fdaca 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -446,6 +446,7 @@ public function nicetimeFilter($date, $long_strings = true) $tense = $this->grav['language']->translate('NICETIME.AGO', null, true); } else if ($now == $unix_date) { + $difference = $now - $unix_date; $tense = $this->grav['language']->translate('NICETIME.JUST_NOW', null, false); } else { diff --git a/user/config/system.yaml b/user/config/system.yaml index 7bc0f51715..474d8edfdb 100644 --- a/user/config/system.yaml +++ b/user/config/system.yaml @@ -41,5 +41,5 @@ debugger: shutdown: close_connection: true gpm: - releases: testing + releases: stable verify_peer: true