From 4cf5f00441a04acd25f228e630eb56a78a28824c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 22 Aug 2017 11:22:13 -0600
Subject: [PATCH 01/19] Added natsort on plugin load #1614

---
 CHANGELOG.md                       | 6 ++++++
 system/src/Grav/Common/Plugins.php | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3fb0d136..79074f36a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.3.3
+## xx/xx/2017
+
+1. [](#improved)
+    * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
+
 # v1.3.2
 ## 08/16/2017
 
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index 340caf15d..25fb356ad 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -27,13 +27,18 @@ class Plugins extends Iterator
         $locator = Grav::instance()['locator'];
 
         $iterator = $locator->getIterator('plugins://');
-        foreach ($iterator as $directory) {
+
+        $plugins = [];
+        foreach($iterator as $directory) {
             if (!$directory->isDir()) {
                 continue;
             }
+            $plugins[] = $directory->getBasename();
+        }
 
-            $plugin = $directory->getBasename();
+        natsort($plugins);
 
+        foreach ($plugins as $plugin) {
             $this->add($this->loadPlugin($plugin));
         }
     }

From 39af36977e88513115940409d93c031367e2ef67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=88=E7=88=B7?= <ash0080@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:17:56 -0500
Subject: [PATCH 02/19] Quick Fix Summary issues (#1554)

* Quick Fix Summary issues

1. Calculate the string size without any html tags, so now you can get exactly what you wanted length;
2. Support utf8 2 character widths characters, like Chinese, Japanese;
3. This is a quick dirty mod, some associated functions should be rethinked;

* fix: Add an option to compatibel with old version

Now, you can use page.summary(10) as normal, or page.summary(10, true) to ignore all html tags and medias

* fit PS2R coding style

* psr-2 reformated without assignment align
---
 system/src/Grav/Common/Page/Page.php | 73 +++++++++++++++++++---------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 2395697ba..1915f0ec7 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -116,7 +116,7 @@ class Page
      * Initializes the page instance variables based on a file
      *
      * @param  \SplFileInfo $file The file information for the .md file that the page represents
-     * @param  string       $extension
+     * @param  string $extension
      *
      * @return $this
      */
@@ -331,7 +331,8 @@ class Page
                         $frontmatter_file = $this->path . '/' . $this->folder . '/frontmatter.yaml';
                         if (file_exists($frontmatter_file)) {
                             $frontmatter_data = (array)Yaml::parse(file_get_contents($frontmatter_file));
-                            $this->header = (object)array_replace_recursive($frontmatter_data, (array)$this->header);
+                            $this->header = (object)array_replace_recursive($frontmatter_data,
+                                (array)$this->header);
                         }
                         // Process frontmatter with Twig if enabled
                         if (Grav::instance()['config']->get('system.pages.frontmatter.process_twig') === true) {
@@ -485,9 +486,11 @@ class Page
      *
      * @param  int $size Max summary size.
      *
+     * @param boolean $textOnly Only count text size.
+     *
      * @return string
      */
-    public function summary($size = null)
+    public function summary($size = null, $textOnly = false)
     {
         $config = (array)Grav::instance()['config']->get('site.summary');
         if (isset($this->header->summary)) {
@@ -501,11 +504,12 @@ class Page
 
         // Set up variables to process summary from page or from custom summary
         if ($this->summary === null) {
-            $content = $this->content();
+            $content = $textOnly ? strip_tags($this->content()) : $this->content();
             $summary_size = $this->summary_size;
         } else {
-            $content = $this->summary;
-            $summary_size = mb_strlen($this->summary);
+            $content = strip_tags($this->summary);
+            // Use mb_strwidth to deal with the 2 character widths characters
+            $summary_size = mb_strwidth($content, 'utf-8');
         }
 
         // Return calculated summary based on summary divider's position
@@ -514,7 +518,12 @@ class Page
         if (!in_array($format, ['short', 'long'])) {
             return $content;
         } elseif (($format === 'short') && isset($summary_size)) {
-            return mb_substr($content, 0, $summary_size);
+            // Use mb_strimwidth to slice the string
+            if (mb_strwidth($content, 'utf8') > $summary_size) {
+                return mb_strimwidth($content, 0, $summary_size);
+            } else {
+                return $content;
+            }
         }
 
         // Get summary size from site config's file
@@ -530,6 +539,15 @@ class Page
             $size = 300;
         }
 
+        // Only return string but not html, wrap whatever html tag you want when using
+        if ($textOnly) {
+            if (mb_strwidth($content, 'utf-8') <= $size) {
+                return $content;
+            }
+
+            return mb_strimwidth($content, 0, $size, '...', 'utf-8');
+        }
+
         $summary = Utils::truncateHTML($content, $size);
 
         return html_entity_decode($summary);
@@ -590,7 +608,7 @@ class Page
 
 
             $process_markdown = $this->shouldProcess('markdown');
-            $process_twig = $this->shouldProcess('twig') || $this->modularTwig() ;
+            $process_twig = $this->shouldProcess('twig') || $this->modularTwig();
 
             $cache_enable = isset($this->header->cache_enable) ? $this->header->cache_enable : $config->get('system.cache.enabled',
                 true);
@@ -801,7 +819,7 @@ class Page
      * Get value from a page variable (used mostly for creating edit forms).
      *
      * @param string $name Variable name.
-     * @param mixed  $default
+     * @param mixed $default
      *
      * @return mixed
      */
@@ -1078,7 +1096,7 @@ class Page
     public function toArray()
     {
         return [
-            'header'  => (array)$this->header(),
+            'header' => (array)$this->header(),
             'content' => (string)$this->value('content')
         ];
     }
@@ -1486,9 +1504,9 @@ class Page
                     foreach ($value as $property => $prop_value) {
                         $prop_key = $key . ":" . $property;
                         $this->metadata[$prop_key] = [
-                            'name'     => $prop_key,
+                            'name' => $prop_key,
                             'property' => $prop_key,
-                            'content'  => htmlspecialchars($prop_value, ENT_QUOTES, 'UTF-8')
+                            'content' => htmlspecialchars($prop_value, ENT_QUOTES, 'UTF-8')
                         ];
                     }
                 } else {
@@ -1497,7 +1515,7 @@ class Page
                         if (in_array($key, $header_tag_http_equivs)) {
                             $this->metadata[$key] = [
                                 'http_equiv' => $key,
-                                'content'    => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
+                                'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
                             ];
                         } elseif ($key == 'charset') {
                             $this->metadata[$key] = ['charset' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
@@ -1505,7 +1523,10 @@ class Page
                             // if it's a social metadata with separator, render as property
                             $separator = strpos($key, ':');
                             $hasSeparator = $separator && $separator < strlen($key) - 1;
-                            $entry = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
+                            $entry = [
+                                'name' => $key,
+                                'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
+                            ];
 
                             if ($hasSeparator) {
                                 $entry['property'] = $key;
@@ -1589,6 +1610,7 @@ class Page
      * Returns the canonical URL for a page
      *
      * @param bool $include_lang
+     *
      * @return string
      */
     public function canonical($include_lang = true)
@@ -1603,6 +1625,7 @@ class Page
      * @param bool $canonical true to return the canonical URL
      * @param bool $include_lang
      * @param bool $raw_route
+     *
      * @return string The url.
      */
     public function url($include_host = false, $canonical = false, $include_lang = true, $raw_route = false)
@@ -2327,7 +2350,7 @@ class Page
      * Helper method to return an ancestor page.
      *
      * @param string $url The url of the page
-     * @param bool   $lookup Name of the parent folder
+     * @param bool $lookup Name of the parent folder
      *
      * @return \Grav\Common\Page\Page page you were looking for if it exists
      */
@@ -2343,7 +2366,7 @@ class Page
      * Helper method to return an ancestor page to inherit from. The current
      * page object is returned.
      *
-     * @param string   $field Name of the parent folder
+     * @param string $field Name of the parent folder
      *
      * @return Page
      */
@@ -2355,11 +2378,12 @@ class Page
 
         return $inherited;
     }
+
     /**
      * Helper method to return an ancestor field only to inherit from. The
      * first occurrence of an ancestor field will be returned if at all.
      *
-     * @param string   $field Name of the parent folder
+     * @param string $field Name of the parent folder
      *
      * @return array
      */
@@ -2373,7 +2397,7 @@ class Page
     /**
      * Method that contains shared logic for inherited() and inheritedField()
      *
-     * @param string   $field Name of the parent folder
+     * @param string $field Name of the parent folder
      *
      * @return array
      */
@@ -2383,11 +2407,12 @@ class Page
 
         /** @var Pages $pages */
         $inherited = $pages->inherited($this->route, $field);
-        $inheritedParams = (array) $inherited->value('header.' . $field);
-        $currentParams = (array) $this->value('header.' . $field);
-        if($inheritedParams && is_array($inheritedParams)) {
+        $inheritedParams = (array)$inherited->value('header.' . $field);
+        $currentParams = (array)$this->value('header.' . $field);
+        if ($inheritedParams && is_array($inheritedParams)) {
             $currentParams = array_replace_recursive($inheritedParams, $currentParams);
         }
+
         return [$inherited, $currentParams];
     }
 
@@ -2395,7 +2420,7 @@ class Page
      * Helper method to return a page.
      *
      * @param string $url the url of the page
-     * @param bool   $all
+     * @param bool $all
      *
      * @return \Grav\Common\Page\Page page you were looking for if it exists
      */
@@ -2411,7 +2436,7 @@ class Page
      * Get a collection of pages in the current context.
      *
      * @param string|array $params
-     * @param boolean      $pagination
+     * @param boolean $pagination
      *
      * @return Collection
      * @throws \InvalidArgumentException
@@ -2747,7 +2772,7 @@ class Page
 
         // Reorder all moved pages.
         foreach ($siblings as $slug => $page) {
-            $order = intval(trim($page->order(),'.'));
+            $order = intval(trim($page->order(), '.'));
             $counter++;
 
             if ($order) {

From 667c4340d86b534201f23633f1a77528417bc751 Mon Sep 17 00:00:00 2001
From: Eihrister <daniel@mostertman.org>
Date: Wed, 23 Aug 2017 22:29:18 +0200
Subject: [PATCH 03/19] Changing back the default redirect code from 301 to
 302. (#1619)

---
 system/config/system.yaml       | 4 ++--
 system/src/Grav/Common/Grav.php | 2 +-
 system/src/Grav/Common/Uri.php  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/config/system.yaml b/system/config/system.yaml
index 382c496be..a6110c4a8 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -58,8 +58,8 @@ pages:
   etag: false                                    # Set the etag header tag
   vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
   redirect_default_route: false                  # Automatically redirect to a page's default route
-  redirect_default_code: 301                     # Default code to use for redirects
-  redirect_trailing_slash: true                  # Handle automatically or 301 redirect a trailing / URL
+  redirect_default_code: 302                     # Default code to use for redirects
+  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
   ignore_files: [.DS_Store]                      # Files to ignore in Pages
   ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
   ignore_hidden: true                            # Ignore all Hidden files and folders
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index ef2125e33..02c889f2c 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -174,7 +174,7 @@ class Grav extends Container
         }
 
         if ($code === null) {
-            $code = $this['config']->get('system.pages.redirect_default_code', 301);
+            $code = $this['config']->get('system.pages.redirect_default_code', 302);
         }
 
         if (isset($this['session'])) {
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index bb95c77ec..45daf1a04 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -295,9 +295,9 @@ class Uri
             $uri = str_replace($setup_base, '', $uri);
         }
 
-        // If configured to, redirect trailing slash URI's with a 301 redirect
+        // If configured to, redirect trailing slash URI's with a 302 redirect
         if ($config->get('system.pages.redirect_trailing_slash', false) && $uri != '/' && Utils::endsWith($uri, '/')) {
-            $grav->redirect(str_replace($this->root, '', rtrim($uri, '/')), 301);
+            $grav->redirect(str_replace($this->root, '', rtrim($uri, '/')), 302);
         }
 
         // process params

From 7a7ffd349213ff671db49b277c259204e1ebf1f4 Mon Sep 17 00:00:00 2001
From: iusvar <severoiuliano@gmail.com>
Date: Wed, 23 Aug 2017 22:30:39 +0200
Subject: [PATCH 04/19] fix Twig dynamic translation (#1618)

* fix Twig dynamic translation

* fix Twig dynamic translation
---
 system/src/Grav/Common/Language/Language.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index ae9546a22..3a34dadd0 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -374,6 +374,7 @@ class Language
     {
         if (is_array($args)) {
             $lookup = array_shift($args);
+            $languages = array_shift($args);
         } else {
             $lookup = $args;
             $args = [];

From 04690ce20639b0518faa3399d6f77ee35be0ff89 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 24 Aug 2017 07:57:56 -0600
Subject: [PATCH 05/19] Use `multilevel` field to handle Asset Collections
 #1201

---
 CHANGELOG.md                         | 1 +
 system/blueprints/config/system.yaml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79074f36a..1a7ba8de3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#improved)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
+    * Use new `multilevel` field to handle Asset Collections [#1201](https://github.com/getgrav/grav-plugin-admin/issues/1201)
 
 # v1.3.2
 ## 08/16/2017
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 9ed7a0753..ee093cf4a 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -806,10 +806,12 @@ form:
                         type: bool
 
                 assets.collections:
-                    type: array
+                    type: multilevel
                     label: PLUGIN_ADMIN.COLLECTIONS
                     placeholder_key: collection_name
                     placeholder_value: collection_path
+                    validate:
+                        type: array
 
         errors:
             type: section

From cc8a20537e7ecba555217781e6aa46c6c48a3b4a Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 24 Aug 2017 09:17:25 -0600
Subject: [PATCH 06/19] Added support for redis `password` option #1620

---
 CHANGELOG.md                         | 1 +
 system/blueprints/config/system.yaml | 6 ++++++
 system/src/Grav/Common/Cache.php     | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a7ba8de3..ad1f06868 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [](#improved)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
     * Use new `multilevel` field to handle Asset Collections [#1201](https://github.com/getgrav/grav-plugin-admin/issues/1201)
+    * Added support for redis `password` option [#1620](https://github.com/getgrav/grav/issues/1620)
 
 # v1.3.2
 ## 08/16/2017
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index ee093cf4a..33c98547e 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -616,6 +616,12 @@ form:
                     help: PLUGIN_ADMIN.REDIS_PORT_HELP
                     placeholder: "6379"
 
+                cache.redis.password:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.REDIS_PASSWORD
+
+
 
         twig:
             type: section
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 6746ab359..254f6fdd0 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -240,6 +240,7 @@ class Cache extends Getters
             case 'redis':
                 $redis = new \Redis();
                 $socket = $this->config->get('system.cache.redis.socket', false);
+                $password = $this->config->get('system.cache.redis.password', false);
 
                 if ($socket) {
                     $redis->connect($socket);
@@ -248,6 +249,11 @@ class Cache extends Getters
                     $this->config->get('system.cache.redis.port', 6379));
                 }
 
+                // Authenticate with password if set
+                if ($password && !$redis->auth($password)) {
+                    throw new \RedisException('Redis authentication failed');
+                }
+
                 $driver = new DoctrineCache\RedisCache();
                 $driver->setRedis($redis);
                 break;

From eecf9148817bb33ba94b131dd51d475cf8afc9d7 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 24 Aug 2017 09:23:15 -0600
Subject: [PATCH 07/19] Updated changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad1f06868..c3cc1c917 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,13 @@
 ## xx/xx/2017
 
 1. [](#improved)
+    * Added options to `Page::summary()` to support size without HTML tags [#1554](https://github.com/getgrav/grav/issues/1554)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
     * Use new `multilevel` field to handle Asset Collections [#1201](https://github.com/getgrav/grav-plugin-admin/issues/1201)
     * Added support for redis `password` option [#1620](https://github.com/getgrav/grav/issues/1620)
+1. [](#bugfix)
+    * Fixed UTF8 2 character support in `Page::summary()` [#1554](https://github.com/getgrav/grav/issues/1554)
+    * Fixed dynamic Twig translation [#1618](https://github.com/getgrav/grav/issues/1618)
 
 # v1.3.2
 ## 08/16/2017

From b7e1eb9d1b74c046f1b2295dca3b87261cee16f0 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 24 Aug 2017 09:26:43 -0600
Subject: [PATCH 08/19] Updated changelog again

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3cc1c917..dd49fe216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
     * Use new `multilevel` field to handle Asset Collections [#1201](https://github.com/getgrav/grav-plugin-admin/issues/1201)
     * Added support for redis `password` option [#1620](https://github.com/getgrav/grav/issues/1620)
+    * Use 302 rather than 301 redirects by default [#1619](https://github.com/getgrav/grav/issues/1619)
 1. [](#bugfix)
     * Fixed UTF8 2 character support in `Page::summary()` [#1554](https://github.com/getgrav/grav/issues/1554)
     * Fixed dynamic Twig translation [#1618](https://github.com/getgrav/grav/issues/1618)

From 0543d997f6648a71c2bbdbdb71cd9a67e29fe3ee Mon Sep 17 00:00:00 2001
From: Chris Jung <campino2k@gmail.com>
Date: Fri, 25 Aug 2017 18:44:59 +0200
Subject: [PATCH 09/19] Gregwar/Image supports gaussianBlur (#1623)

Since grav uses the GD Adapter of Gregwar/Image and has no option to change it, this should be safe to implement, when the latest Version of the Lib is used.
---
 system/src/Grav/Common/Page/Medium/ImageMedium.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 8cfcb1017..23b5b3ce7 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -51,7 +51,7 @@ class ImageMedium extends Medium
         'resize', 'forceResize', 'cropResize', 'crop', 'zoomCrop',
         'negate', 'brightness', 'contrast', 'grayscale', 'emboss',
         'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive',
-        'rotate', 'flip', 'fixOrientation'
+        'rotate', 'flip', 'fixOrientation', 'gaussianBlur'
     ];
 
     /**

From d1b0f12e5bfef59d7594f70d1506bbf29e1e49e0 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 25 Aug 2017 10:47:32 -0600
Subject: [PATCH 10/19] Added `gaussianBlur` media method #1623

---
 CHANGELOG.md  | 2 ++
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd49fe216..26b08ac00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # v1.3.3
 ## xx/xx/2017
 
+1. [](#new)
+    * Added `gaussianBlur` media method [#1623](https://github.com/getgrav/grav/pull/1623)
 1. [](#improved)
     * Added options to `Page::summary()` to support size without HTML tags [#1554](https://github.com/getgrav/grav/issues/1554)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
diff --git a/composer.json b/composer.json
index 1b7056e79..64393678d 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "filp/whoops": "~2.0",
         "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
+        "gregwar/image": "2.*",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
         "rockettheme/toolbox": "~1.0",

From 3eace662747bf68372f7504964a558ded82a4556 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 25 Aug 2017 16:40:10 -0600
Subject: [PATCH 11/19] Added 2fa authenticator check

---
 system/blueprints/user/account.yaml | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 3d4d7cb78..768d879b6 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -66,6 +66,36 @@ form:
                 default: 'en'
                 help: PLUGIN_ADMIN.LANGUAGE_HELP
 
+            twofa_check:
+                type: conditional
+                condition: config.plugins.admin.twofa_enabled
+
+                fields:
+
+                    twofa:
+                        title: PLUGIN_ADMIN.2FA_TITLE
+                        type: section
+                        underline: true
+
+                    twofa_enabled:
+                        type: toggle
+                        label: PLUGIN_ADMIN.2FA_ENABLED
+                        classes: twofa-toggle
+                        highlight: 0
+                        default: 0
+                        options:
+                          1: PLUGIN_ADMIN.YES
+                          0: PLUGIN_ADMIN.NO
+                        validate:
+                          type: bool
+
+
+                    twofa_secret:
+                        type: 2fa_secret
+                        outerclasses: 'twofa-secret'
+                        label: PLUGIN_ADMIN.2FA_SECRET
+                        help: PLUGIN_ADMIN.2FA_SECRET_HELP
+
             security:
                 title: PLUGIN_ADMIN.ACCESS_LEVELS
                 type: section

From 42d3b12b131a1704c8da30c572c533a57e51197e Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 25 Aug 2017 18:42:57 -0600
Subject: [PATCH 12/19] moved from help to sublabel

---
 system/blueprints/user/account.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 768d879b6..d83b6845b 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -94,7 +94,8 @@ form:
                         type: 2fa_secret
                         outerclasses: 'twofa-secret'
                         label: PLUGIN_ADMIN.2FA_SECRET
-                        help: PLUGIN_ADMIN.2FA_SECRET_HELP
+                        sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
+
 
             security:
                 title: PLUGIN_ADMIN.ACCESS_LEVELS

From 299a6580502078bd430a0391c670e32f8e5ee6da Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 25 Aug 2017 18:43:28 -0600
Subject: [PATCH 13/19] updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b08ac00..3c573db12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#new)
     * Added `gaussianBlur` media method [#1623](https://github.com/getgrav/grav/pull/1623)
+    * Added support for 2-Factor Auth in admin profile
 1. [](#improved)
     * Added options to `Page::summary()` to support size without HTML tags [#1554](https://github.com/getgrav/grav/issues/1554)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)

From d075c2925453635d49703bfbab1d70c28fa467dc Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 26 Aug 2017 11:49:57 -0600
Subject: [PATCH 14/19] Added chunk_split() twig filter

---
 CHANGELOG.md                                  |  3 ++-
 system/src/Grav/Common/Twig/TwigExtension.php | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c573db12..7f15db31a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 ## xx/xx/2017
 
 1. [](#new)
+    * Added support for 2-Factor Authentication in admin profile
     * Added `gaussianBlur` media method [#1623](https://github.com/getgrav/grav/pull/1623)
-    * Added support for 2-Factor Auth in admin profile
+    * Added new `|chunk_split()` Twig filter
 1. [](#improved)
     * Added options to `Page::summary()` to support size without HTML tags [#1554](https://github.com/getgrav/grav/issues/1554)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index d6f417376..ebd58c338 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -67,6 +67,8 @@ class TwigExtension extends \Twig_Extension
             new \Twig_SimpleFilter('*ize', [$this, 'inflectorFilter']),
             new \Twig_SimpleFilter('absolute_url', [$this, 'absoluteUrlFilter']),
             new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
+            new \Twig_SimpleFilter('chunk_split', [$this, 'chunkSplitFilter']),
+
             new \Twig_SimpleFilter('defined', [$this, 'definedDefaultFilter']),
             new \Twig_SimpleFilter('ends_with', [$this, 'endsWithFilter']),
             new \Twig_SimpleFilter('fieldName', [$this, 'fieldNameFilter']),
@@ -377,6 +379,19 @@ class TwigExtension extends \Twig_Extension
         return $array;
     }
 
+    /**
+     * Wrapper for chunk_split() function
+     *
+     * @param $value
+     * @param $chars
+     * @param string $split
+     * @return string
+     */
+    public function chunkSplitFilter($value, $chars, $split = '-')
+    {
+        return chunk_split($value, $chars, $split);
+    }
+
     /**
      * determine if a string contains another
      *

From 535a3d9a83e622ee1a7c2151c91e1ce1a6674f12 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 26 Aug 2017 18:39:05 -0600
Subject: [PATCH 15/19] return if not authenticated

---
 system/src/Grav/Common/User/User.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index 7768d888b..9b2b45bdd 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -197,6 +197,10 @@ class User extends Data
             return false;
         }
 
+        if (!$this->authenticated) {
+            return false;
+        }
+
         if (isset($this->state) && $this->state !== 'enabled') {
             return false;
         }

From c52931e7fa573550764cb7586a81f2c440c6de25 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 27 Aug 2017 12:57:39 -0600
Subject: [PATCH 16/19] hilight for 2fa in account should be on `true`

---
 system/blueprints/user/account.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index d83b6845b..29628c40a 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -81,7 +81,7 @@ form:
                         type: toggle
                         label: PLUGIN_ADMIN.2FA_ENABLED
                         classes: twofa-toggle
-                        highlight: 0
+                        highlight: 1
                         default: 0
                         options:
                           1: PLUGIN_ADMIN.YES

From 3572833e7aebe8a209de1f3755387f8a368b742e Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 28 Aug 2017 12:02:11 -0600
Subject: [PATCH 17/19] Revert "fix Twig dynamic translation (#1618)"

This reverts commit 7a7ffd349213ff671db49b277c259204e1ebf1f4.
---
 system/src/Grav/Common/Language/Language.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index 3a34dadd0..ae9546a22 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -374,7 +374,6 @@ class Language
     {
         if (is_array($args)) {
             $lookup = array_shift($args);
-            $languages = array_shift($args);
         } else {
             $lookup = $args;
             $args = [];

From 550b51f77ad34a3a70b741b1f4c201e3c5469c93 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 28 Aug 2017 12:22:53 -0600
Subject: [PATCH 18/19] Added new `tl` filter/function to translate language
 #1618

This addresses issues with the PR.  It uses a new twig filter that gives full access to the langauges->translate() function.
---
 system/src/Grav/Common/Twig/TwigExtension.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index ebd58c338..a8878224c 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -92,6 +92,7 @@ class TwigExtension extends \Twig_Extension
             new \Twig_SimpleFilter('sort_by_key', [$this, 'sortByKeyFilter']),
             new \Twig_SimpleFilter('starts_with', [$this, 'startsWithFilter']),
             new \Twig_SimpleFilter('t', [$this, 'translate']),
+            new \Twig_SimpleFilter('tl', [$this, 'translateLanguage']),
             new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
             new \Twig_SimpleFilter('truncate', ['\Grav\Common\Utils', 'truncate']),
             new \Twig_SimpleFilter('truncate_html', ['\Grav\Common\Utils', 'truncateHTML']),
@@ -127,6 +128,7 @@ class TwigExtension extends \Twig_Extension
             new \Twig_SimpleFunction('regex_replace', [$this, 'regexReplace']),
             new \Twig_SimpleFunction('string', [$this, 'stringFunc']),
             new \Twig_simpleFunction('t', [$this, 'translate']),
+            new \Twig_simpleFunction('tl', [$this, 'translateLanguage']),
             new \Twig_simpleFunction('ta', [$this, 'translateArray']),
             new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
             new \Twig_SimpleFunction('json_decode', [$this, 'jsonDecodeFilter']),
@@ -610,6 +612,20 @@ class TwigExtension extends \Twig_Extension
         return $this->grav['language']->translate(func_get_args());
     }
 
+    /**
+     * Translate Strings
+     *
+     * @param $args
+     * @param array|null $languages
+     * @param bool $array_support
+     * @param bool $html_out
+     * @return mixed
+     */
+    public function translateLanguage($args, array $languages = null, $array_support = false, $html_out = false)
+    {
+        return $this->grav['language']->translate($args, $languages, $array_support, $html_out);
+    }
+
     /**
      * @param      $key
      * @param      $index

From 7a3f136207fa0cd621ff2409efed7cd62edda65f Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 28 Aug 2017 12:29:03 -0600
Subject: [PATCH 19/19] updated changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f15db31a..e5b01b365 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Added support for 2-Factor Authentication in admin profile
     * Added `gaussianBlur` media method [#1623](https://github.com/getgrav/grav/pull/1623)
     * Added new `|chunk_split()` Twig filter
+    * Added new `tl` Twig filter/function to spport specific translations [#1618](https://github.com/getgrav/grav/issues/1618)
 1. [](#improved)
     * Added options to `Page::summary()` to support size without HTML tags [#1554](https://github.com/getgrav/grav/issues/1554)
     * Forced `natsort` on plugins to ensure consistent plugin load ordering across platforms [#1614](https://github.com/getgrav/grav/issues/1614)
@@ -13,7 +14,6 @@
     * Use 302 rather than 301 redirects by default [#1619](https://github.com/getgrav/grav/issues/1619)
 1. [](#bugfix)
     * Fixed UTF8 2 character support in `Page::summary()` [#1554](https://github.com/getgrav/grav/issues/1554)
-    * Fixed dynamic Twig translation [#1618](https://github.com/getgrav/grav/issues/1618)
 
 # v1.3.2
 ## 08/16/2017