From 7947ba24422e74a4831151828e5f768267fda130 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Thu, 16 Apr 2015 17:42:29 +0200
Subject: [PATCH 01/64] fix config reload to actually reload from files

---
 system/src/Grav/Common/Config/Config.php      | 100 ++++++++----------
 .../Common/Service/ConfigServiceProvider.php  |  12 +--
 2 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index 1fe373a40..ef08830a0 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -75,6 +75,8 @@ class Config extends Data
         ]
     ];
 
+    protected $setup = [];
+
     protected $blueprintFiles = [];
     protected $configFiles = [];
     protected $checksum;
@@ -88,33 +90,25 @@ class Config extends Data
     protected $environment;
     protected $messages = [];
 
-    public function __construct(array $items = array(), Grav $grav = null, $environment = null)
+    public function __construct(array $setup = array(), Grav $grav = null, $environment = null)
     {
         $this->grav = $grav ?: Grav::instance();
         $this->finder = new ConfigFinder;
         $this->environment = $environment ?: 'localhost';
         $this->messages[] = 'Environment Name: ' . $this->environment;
 
-        if (isset($items['@class'])) {
-            if ($items['@class'] != get_class($this)) {
-                throw new \InvalidArgumentException('Unrecognized config cache file!');
-            }
-            // Loading pre-compiled configuration.
-            $this->timestamp = (int) $items['timestamp'];
-            $this->checksum = $items['checksum'];
-            $this->items = (array) $items['data'];
-        } else {
-            // Make sure that
-            if (!isset($items['streams']['schemes'])) {
-                $items['streams']['schemes'] = [];
-            }
-            $items['streams']['schemes'] += $this->streams;
-
-            $items = $this->autoDetectEnvironmentConfig($items);
-            $this->messages[] = $items['streams']['schemes']['config']['prefixes'][''];
-
-            parent::__construct($items);
+        // Make sure that
+        if (!isset($setup['streams']['schemes'])) {
+            $setup['streams']['schemes'] = [];
         }
+        $setup['streams']['schemes'] += $this->streams;
+
+        $setup = $this->autoDetectEnvironmentConfig($setup);
+        $this->messages[] = $setup['streams']['schemes']['config']['prefixes'][''];
+
+        $this->setup = $setup;
+        parent::__construct($setup);
+
         $this->check();
     }
 
@@ -125,8 +119,10 @@ class Config extends Data
 
     public function reload()
     {
+        $this->items = $this->setup;
         $this->check();
         $this->init();
+        $this->debug();
 
         return $this;
     }
@@ -150,6 +146,7 @@ class Config extends Data
         foreach ($this->messages as $message) {
             $this->grav['debugger']->addMessage($message);
         }
+        $this->messages = [];
     }
 
     public function init()
@@ -161,15 +158,6 @@ class Config extends Data
         $this->blueprintLookup = $locator->findResources('blueprints://config');
         $this->pluginLookup = $locator->findResources('plugins://');
 
-        if (!isset($this->checksum)) {
-            $this->messages[] = 'No cached configuration, compiling new configuration..';
-        } elseif ($this->checksum() != $this->checksum) {
-            $this->messages[] = 'Configuration checksum mismatch, reloading configuration..';
-        } else {
-            $this->messages[] = 'Configuration checksum matches, using cached version.';
-            return;
-        }
-
         $this->loadCompiledBlueprints($this->blueprintLookup, $this->pluginLookup, 'master');
         $this->loadCompiledConfig($this->configLookup, $this->pluginLookup, 'master');
 
@@ -255,7 +243,6 @@ class Config extends Data
                 'files' => $blueprintFiles,
                 'data' => $this->blueprints->toArray()
             ];
-
             // If compiled file wasn't already locked by another process, save it.
             if ($file->locked() !== false) {
                 $this->messages[] = 'Saving compiled blueprints.';
@@ -269,44 +256,51 @@ class Config extends Data
 
     protected function loadCompiledConfig($configs, $plugins, $filename = null)
     {
-        $checksum = md5(json_encode($configs));
         $filename = $filename
             ? CACHE_DIR . 'compiled/config/' . $filename . '-' . $this->environment . '.php'
             : CACHE_DIR . 'compiled/config/' . $checksum . '-' . $this->environment . '.php';
         $file = PhpFile::instance($filename);
         $cache = $file->exists() ? $file->content() : null;
-        $configFiles = $this->finder->locateConfigFiles($configs, $plugins);
-        $checksum .= ':'.md5(json_encode($configFiles));
         $class = get_class($this);
+        $checksum = $this->checksum();
 
-        // Load real file if cache isn't up to date (or is invalid).
         if (
             !is_array($cache)
             || !isset($cache['checksum'])
             || !isset($cache['@class'])
-            || $cache['checksum'] != $checksum
             || $cache['@class'] != $class
         ) {
-            // Attempt to lock the file for writing.
-            $file->lock(false);
+            $this->messages[] = 'No cached configuration, compiling new configuration..';
+        } else if ($cache['checksum'] !== $checksum) {
+            $this->messages[] = 'Configuration checksum mismatch, reloading configuration..';
+        } else {
+            $this->messages[] = 'Configuration checksum matches, using cached version.';
 
-            // Load configuration.
-            foreach ($configFiles as $files) {
-                $this->loadConfigFiles($files);
-            }
-            $cache = [
-                '@class' => $class,
-                'timestamp' => time(),
-                'checksum' => $this->checksum(),
-                'data' => $this->toArray()
-            ];
+            $this->items = $cache['data'];
+            return;
+        }
 
-            // If compiled file wasn't already locked by another process, save it.
-            if ($file->locked() !== false) {
-                $this->messages[] = 'Saving compiled configuration.';
-                $file->save($cache);
-                $file->unlock();
-            }
+        $configFiles = $this->finder->locateConfigFiles($configs, $plugins);
+
+        // Attempt to lock the file for writing.
+        $file->lock(false);
+
+        // Load configuration.
+        foreach ($configFiles as $files) {
+            $this->loadConfigFiles($files);
+        }
+        $cache = [
+            '@class' => $class,
+            'timestamp' => time(),
+            'checksum' => $checksum,
+            'data' => $this->toArray()
+        ];
+
+        // If compiled file wasn't already locked by another process, save it.
+        if ($file->locked() !== false) {
+            $this->messages[] = 'Saving compiled configuration.';
+            $file->save($cache);
+            $file->unlock();
         }
 
         $this->items = $cache['data'];
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index c66732b08..28a6ac4d9 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -38,18 +38,8 @@ class ConfigServiceProvider implements ServiceProviderInterface
     public function loadMasterConfig(Container $container)
     {
         $environment = $this->getEnvironment($container);
-        $file = CACHE_DIR . 'compiled/config/master-'.$environment.'.php';
-        $data = is_file($file) ? (array) include $file : [];
-        if ($data) {
-            try {
-                $config = new Config($data, $container, $environment);
-            } catch (\Exception $e) {
-            }
-        }
 
-        if (!isset($config)) {
-            $config = new Config($this->setup, $container, $environment);
-        }
+        $config = new Config($this->setup, $container, $environment);
 
         return $config;
     }

From f3b4efb66155e8df3a2ca8b5b36b240436e7c094 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Thu, 16 Apr 2015 17:43:03 +0200
Subject: [PATCH 02/64] Make plugins and themes load the merged config from all
 files

---
 system/src/Grav/Common/Plugins.php | 4 ++--
 system/src/Grav/Common/Themes.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index d0c30c3e3..9d8167df9 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -123,10 +123,10 @@ class Plugins extends Iterator
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $file = CompiledYamlFile::instance("user://config/plugins/{$name}.yaml");
-        $obj->merge($file->content());
+        $obj->merge($this->grav['config']->get('plugins.' . $name) ?: []);
 
         // Save configuration always to user/config.
+        $file = CompiledYamlFile::instance("config://plugins/{$name}.yaml");
         $obj->file($file);
 
         return $obj;
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index 4ec394ee9..ab4696a88 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -106,10 +106,10 @@ class Themes extends Iterator
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $file = CompiledYamlFile::instance("user://config/themes/{$name}" . YAML_EXT);
-        $obj->merge($file->content());
+        $obj->merge($this->grav['config']->get('themes.' . $name) ?: []);
 
         // Save configuration always to user/config.
+        $file = CompiledYamlFile::instance("config://themes/{$name}" . YAML_EXT);
         $obj->file($file);
 
         return $obj;

From 7e94e464595c53684ebc406a61d823273f81dd7e Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Thu, 16 Apr 2015 17:54:48 +0200
Subject: [PATCH 03/64] use gravtrait in plugins

---
 system/src/Grav/Common/Grav.php    |  2 +-
 system/src/Grav/Common/Plugins.php | 21 +++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index df584fe4b..2068f3454 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -78,7 +78,7 @@ class Grav extends Container
             return new Cache($c);
         };
         $container['plugins'] = function ($c) {
-            return new Plugins($c);
+            return new Plugins();
         };
         $container['themes'] = function ($c) {
             return new Themes($c);
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index 9d8167df9..b6264e9d9 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -4,6 +4,7 @@ namespace Grav\Common;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
+use Grav\Common\GravTrait;
 use Grav\Common\File\CompiledYamlFile;
 use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
@@ -17,12 +18,7 @@ use RocketTheme\Toolbox\Event\EventSubscriberInterface;
  */
 class Plugins extends Iterator
 {
-    protected $grav;
-
-    public function __construct(Grav $grav)
-    {
-        $this->grav = $grav;
-    }
+    use GravTrait;
 
     /**
      * Recurses through the plugins directory creating Plugin objects for each plugin it finds.
@@ -33,11 +29,11 @@ class Plugins extends Iterator
     public function init()
     {
         /** @var Config $config */
-        $config = $this->grav['config'];
+        $config = self::getGrav()['config'];
         $plugins = (array) $config->get('plugins');
 
         /** @var EventDispatcher $events */
-        $events = $this->grav['events'];
+        $events = self::getGrav()['events'];
 
         foreach ($plugins as $plugin => $data) {
             if (empty($data['enabled'])) {
@@ -45,9 +41,10 @@ class Plugins extends Iterator
                 continue;
             }
 
-            $filePath = $this->grav['locator']('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
+            $locator = self::getGrav()['locator'];
+            $filePath = $locator('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
             if (!is_file($filePath)) {
-                $this->grav['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
+                self::getGrav()['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
                 continue;
             }
 
@@ -70,7 +67,7 @@ class Plugins extends Iterator
                 throw new \RuntimeException(sprintf("Plugin '%s' class not found! Try reinstalling this plugin.", $plugin));
             }
 
-            $instance = new $pluginClassName($plugin, $this->grav, $config);
+            $instance = new $pluginClassName($plugin, self::getGrav(), $config);
             if ($instance instanceof EventSubscriberInterface) {
                 $events->addSubscriber($instance);
             }
@@ -123,7 +120,7 @@ class Plugins extends Iterator
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $obj->merge($this->grav['config']->get('plugins.' . $name) ?: []);
+        $obj->merge(self::getGrav()['config']->get('plugins.' . $name) ?: []);
 
         // Save configuration always to user/config.
         $file = CompiledYamlFile::instance("config://plugins/{$name}.yaml");

From 4883a408c764014e5dc5d73017235730e1d8d4ac Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 25 Apr 2015 18:41:45 -0600
Subject: [PATCH 04/64] updated composer.phar

---
 bin/composer.phar | Bin 1075141 -> 1098591 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/composer.phar b/bin/composer.phar
index 31b9d3915f604997a7c343b86e86137b118b4769..f3d065ad9b311e025c02b25fde40e2ded287b53d 100755
GIT binary patch
delta 33041
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
Hf9L-P)1WFv

delta 9881
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
VPkQ#)KDx8@B>iDr(xEfy{s{u>ZCn5V


From 8887f8862d9e6afca4bc4623dee26d674ac9c6d1 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 15:30:10 -0600
Subject: [PATCH 05/64] Improved and cleaned up a couple of folder methods

---
 system/src/Grav/Common/Filesystem/Folder.php  | 63 +++++++++++++++--
 system/src/Grav/Common/Utils.php              | 69 -------------------
 .../src/Grav/Console/Cli/SandboxCommand.php   |  4 +-
 .../src/Grav/Console/Gpm/InstallCommand.php   |  2 +-
 4 files changed, 60 insertions(+), 78 deletions(-)

diff --git a/system/src/Grav/Common/Filesystem/Folder.php b/system/src/Grav/Common/Filesystem/Folder.php
index 9355038b8..8309bebff 100644
--- a/system/src/Grav/Common/Filesystem/Folder.php
+++ b/system/src/Grav/Common/Filesystem/Folder.php
@@ -278,6 +278,46 @@ abstract class Folder
         }
     }
 
+    /**
+     * Recursive copy of one directory to another
+     *
+     * @param $src
+     * @param $dest
+     *
+     * @return bool
+     */
+    public static function rcopy($src, $dest)
+    {
+
+        // If the src is not a directory do a simple file copy
+        if (!is_dir($src)) {
+            copy($src, $dest);
+            return true;
+        }
+
+        // If the destination directory does not exist create it
+        if (!is_dir($dest)) {
+            if (!mkdir($dest)) {
+                // If the destination directory could not be created stop processing
+                return false;
+            }
+        }
+
+        // Open the source directory to read in files
+        $i = new \DirectoryIterator($src);
+        /** @var \DirectoryIterator $f */
+        foreach ($i as $f) {
+            if ($f->isFile()) {
+                copy($f->getRealPath(), "$dest/" . $f->getFilename());
+            } else {
+                if (!$f->isDot() && $f->isDir()) {
+                    static::rcopy($f->getRealPath(), "$dest/$f");
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * @param  string $folder
      * @return bool
@@ -290,13 +330,24 @@ abstract class Folder
             return @unlink($folder);
         }
 
-        // Go through all items in filesystem and recursively remove everything.
-        $files = array_diff(scandir($folder), array('.', '..'));
-        foreach ($files as $file) {
-            $path = "{$folder}/{$file}";
-            (is_dir($path)) ? self::doDelete($path) : @unlink($path);
+        $files = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($folder, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        /** @var \DirectoryIterator $fileinfo */
+        foreach ($files as $fileinfo) {
+            if ($fileinfo->isDir()) {
+                if (false === rmdir($fileinfo->getRealPath())) {
+                    return false;
+                }
+            } else {
+                if (false === unlink($fileinfo->getRealPath())) {
+                    return false;
+                }
+            }
         }
 
-        return @rmdir($folder);
+        return rmdir($folder);
     }
 }
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index eee0ee4f9..830cb6a6b 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -54,75 +54,6 @@ abstract class Utils
         return (object) array_merge((array) $obj1, (array) $obj2);
     }
 
-    /**
-     * Recursive remove a directory - DANGEROUS! USE WITH CARE!!!!
-     *
-     * @param $dir
-     * @return bool
-     */
-    public static function rrmdir($dir)
-    {
-        $files = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        /** @var \DirectoryIterator $fileinfo */
-        foreach ($files as $fileinfo) {
-            if ($fileinfo->isDir()) {
-                if (false === rmdir($fileinfo->getRealPath())) {
-                    return false;
-                }
-            } else {
-                if (false === unlink($fileinfo->getRealPath())) {
-                    return false;
-                }
-            }
-        }
-
-        return rmdir($dir);
-    }
-
-    /**
-     * Recursive copy of one directory to another
-     *
-     * @param $src
-     * @param $dest
-     *
-     * @return bool
-     */
-    public static function rcopy($src, $dest)
-    {
-
-        // If the src is not a directory do a simple file copy
-        if (!is_dir($src)) {
-            copy($src, $dest);
-            return true;
-        }
-
-        // If the destination directory does not exist create it
-        if (!is_dir($dest)) {
-            if (!mkdir($dest)) {
-                // If the destination directory could not be created stop processing
-                return false;
-            }
-        }
-
-        // Open the source directory to read in files
-        $i = new \DirectoryIterator($src);
-        /** @var \DirectoryIterator $f */
-        foreach ($i as $f) {
-            if ($f->isFile()) {
-                copy($f->getRealPath(), "$dest/" . $f->getFilename());
-            } else {
-                if (!$f->isDot() && $f->isDir()) {
-                    static::rcopy($f->getRealPath(), "$dest/$f");
-                }
-            }
-        }
-        return true;
-    }
-
     /**
      * Truncate HTML by text length.
      *
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index 4d984d219..c1e79ecdc 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -189,7 +189,7 @@ class SandboxCommand extends Command
             $to = $this->destination . $target;
 
             $this->output->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
-            Utils::rcopy($from, $to);
+            Folder::rcopy($from, $to);
         }
     }
 
@@ -269,7 +269,7 @@ class SandboxCommand extends Command
 
         if (count($pages_files) == 0) {
             $destination = $this->source . '/user/pages';
-            Utils::rcopy($destination, $pages_dir);
+            Folder::rcopy($destination, $pages_dir);
             $this->output->writeln('    <cyan>' . $destination . '</cyan> <comment>-></comment> Created');
 
         }
diff --git a/system/src/Grav/Console/Gpm/InstallCommand.php b/system/src/Grav/Console/Gpm/InstallCommand.php
index c39087db4..60e01196f 100644
--- a/system/src/Grav/Console/Gpm/InstallCommand.php
+++ b/system/src/Grav/Console/Gpm/InstallCommand.php
@@ -255,7 +255,7 @@ class InstallCommand extends Command
 
             // Confirmation received, copy over the data
             $this->output->writeln("  |- Installing demo content...    <green>ok</green>                             ");
-            Utils::rcopy($demo_dir, $dest_dir);
+            Folder::rcopy($demo_dir, $dest_dir);
             $this->output->writeln("  '- <green>Success!</green>  ");
             $this->output->writeln('');
         }

From 8a2817a305df084937813214278bf3ddf63f0067 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 16:39:58 -0600
Subject: [PATCH 06/64] Added check for curl in GPM

---
 bin/gpm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/gpm b/bin/gpm
index 803722981..26305d3fa 100755
--- a/bin/gpm
+++ b/bin/gpm
@@ -26,6 +26,10 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
+if (!function_exists('curl_version')) {
+    exit('FATAL: GPM requires PHP Curl module to be installed');
+}
+
 $grav = Grav::instance(array('loader' => $autoload));
 $grav['config']->init();
 $grav['streams'];

From 4bda629a6a2bfc47771e6556b3bf1238859a52e6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 16:58:45 -0600
Subject: [PATCH 07/64] handle condition of errors resulting in blank page.

---
 system/src/Grav/Common/Service/ErrorServiceProvider.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Service/ErrorServiceProvider.php b/system/src/Grav/Common/Service/ErrorServiceProvider.php
index 66453e34d..ac676ad98 100644
--- a/system/src/Grav/Common/Service/ErrorServiceProvider.php
+++ b/system/src/Grav/Common/Service/ErrorServiceProvider.php
@@ -30,7 +30,11 @@ class ErrorServiceProvider implements ServiceProviderInterface
 
         $logger = $container['log'];
         $errors->pushHandler(function (\Exception $exception, $inspector, $run) use ($logger) {
-            $logger->addCritical($exception->getMessage(). ' - Trace: '. $exception->getTraceAsString());
+            try {
+                $logger->addCritical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
+            } catch (\Exception $e) {
+                echo $e;
+            }
         }, 'log');
 
         $errors->register();

From d461fac0890cb10df72c15b31037858cb7c2e8aa Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 17:20:52 -0600
Subject: [PATCH 08/64] optimize install of vendor libs

---
 system/src/Grav/Console/Cli/InstallCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
index f0510a51f..a8c98f370 100644
--- a/system/src/Grav/Console/Cli/InstallCommand.php
+++ b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -98,7 +98,7 @@ class InstallCommand extends Command
             if (!$input->getOption('symlink')) {
                 // Updates composer first
                 $output->writeln("\nInstalling vendor dependencies");
-                $output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction update'));
+                $output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev -o install'));
 
                 $this->gitclone($output);
             } else {

From d25699397fb9f3883e65fe3e566c79078d226e1f Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 17:21:12 -0600
Subject: [PATCH 09/64] add composer update to gpm selfupgrade

---
 system/src/Grav/Console/Gpm/SelfupgradeCommand.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 4d2895312..2b80b2793 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -153,6 +153,9 @@ class SelfupgradeCommand extends Command
             $this->output->writeln('');
         }
 
+        $this->output->writeln("\nInstalling vendor dependencies");
+        $this->output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev -o install'));
+
         // clear cache after successful upgrade
         $this->clearCache('all');
     }

From ae453dbc71ef9d27de2dbaeda5a97728eae2ebbf Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 17:21:38 -0600
Subject: [PATCH 10/64] restore deprecated for whoops - causing composer issue

---
 system/src/Grav/Console/Cli/CleanCommand.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
index 749b7c5e8..5ceaed611 100644
--- a/system/src/Grav/Console/Cli/CleanCommand.php
+++ b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -66,7 +66,6 @@ class CleanCommand extends Command
         'vendor/filp/whoops/.scrutinizer.yml',
         'vendor/filp/whoops/.travis.yml',
         'vendor/filp/whoops/phpunit.xml.dist',
-        'vendor/filp/whoops/src/deprecated',
         'vendor/gregwar/image/Gregwar/Image/composer.json',
         'vendor/gregwar/image/Gregwar/Image/phpunit.xml',
         'vendor/gregwar/image/Gregwar/Image/.gitignore',

From 2936d26f8d450308c2e9a8ea898800ae2ba755f8 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 17:37:34 -0600
Subject: [PATCH 11/64] added --prefer-dist to these commands

---
 system/src/Grav/Console/Cli/InstallCommand.php     | 2 +-
 system/src/Grav/Console/Gpm/SelfupgradeCommand.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
index a8c98f370..b316e5701 100644
--- a/system/src/Grav/Console/Cli/InstallCommand.php
+++ b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -98,7 +98,7 @@ class InstallCommand extends Command
             if (!$input->getOption('symlink')) {
                 // Updates composer first
                 $output->writeln("\nInstalling vendor dependencies");
-                $output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev -o install'));
+                $output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev --prefer-dist -o install'));
 
                 $this->gitclone($output);
             } else {
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 2b80b2793..29eb77d58 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -154,7 +154,7 @@ class SelfupgradeCommand extends Command
         }
 
         $this->output->writeln("\nInstalling vendor dependencies");
-        $this->output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev -o install'));
+        $this->output->writeln(system('php bin/composer.phar --working-dir="'.GRAV_ROOT.'" --no-interaction --no-dev --prefer-dist -o install'));
 
         // clear cache after successful upgrade
         $this->clearCache('all');

From 21cc9f86f3182db113e7b8a2b9f15bf6fa3b14ac Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 18:00:34 -0600
Subject: [PATCH 12/64] added new composer update command

---
 bin/grav                                      |  3 +-
 .../src/Grav/Console/Cli/ComposerCommand.php  | 80 +++++++++++++++++++
 .../src/Grav/Console/Cli/InstallCommand.php   |  5 +-
 system/src/Grav/Console/ConsoleTrait.php      |  5 ++
 .../Grav/Console/Gpm/SelfupgradeCommand.php   |  2 +-
 5 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 system/src/Grav/Console/Cli/ComposerCommand.php

diff --git a/bin/grav b/bin/grav
index 2b754f153..2d412dd36 100755
--- a/bin/grav
+++ b/bin/grav
@@ -9,7 +9,7 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
     echo "Preparing to install vendor dependencies...\n\n";
-    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction install');
+    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist install');
     echo "\n\n";
 }
 
@@ -28,6 +28,7 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
 $app = new Application('Grav CLI Application', '0.1.0');
 $app->addCommands(array(
     new Grav\Console\Cli\InstallCommand(),
+    new Grav\Console\Cli\ComposerCommand(),
     new Grav\Console\Cli\SandboxCommand(),
     new Grav\Console\Cli\CleanCommand(),
     new Grav\Console\Cli\ClearCacheCommand(),
diff --git a/system/src/Grav/Console/Cli/ComposerCommand.php b/system/src/Grav/Console/Cli/ComposerCommand.php
new file mode 100644
index 000000000..3a28718ac
--- /dev/null
+++ b/system/src/Grav/Console/Cli/ComposerCommand.php
@@ -0,0 +1,80 @@
+<?php
+namespace Grav\Console\Cli;
+
+use Grav\Console\ConsoleTrait;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Class ComposerCommand
+ * @package Grav\Console\Cli
+ */
+class ComposerCommand extends Command
+{
+    use ConsoleTrait;
+
+    /**
+     * @var
+     */
+    protected $config;
+    /**
+     * @var
+     */
+    protected $local_config;
+    /**
+     * @var
+     */
+    protected $destination;
+    /**
+     * @var
+     */
+    protected $user_path;
+
+    /**
+     *
+     */
+    protected function configure()
+    {
+        $this
+            ->setName("composer")
+            ->addOption(
+                'install',
+                'i',
+                InputOption::VALUE_NONE,
+                'install the dependencies'
+            )
+            ->addOption(
+                'update',
+                'u',
+                InputOption::VALUE_NONE,
+                'update the dependencies'
+            )
+            ->setDescription("Updates the composer vendordependencies needed by Grav.")
+            ->setHelp('The <info>composer</info> command updates the composer vendordependencies needed by Grav');
+    }
+
+    /**
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     *
+     * @return int|null|void
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $action = 'update';
+
+        if ($input->getOption('install')) {
+            $action = 'install';
+        }
+
+        // Updates composer first
+        $output->writeln("\nInstalling vendor dependencies");
+        $output->writeln($this->composerUpdate(GRAV_ROOT, $action));
+    }
+
+}
diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
index b316e5701..8aead008f 100644
--- a/system/src/Grav/Console/Cli/InstallCommand.php
+++ b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -1,6 +1,7 @@
 <?php
 namespace Grav\Console\Cli;
 
+use Grav\Console\ConsoleTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,7 +16,7 @@ use Symfony\Component\Yaml\Yaml;
  */
 class InstallCommand extends Command
 {
-
+    use ConsoleTrait;
     /**
      * @var
      */
@@ -98,7 +99,7 @@ class InstallCommand extends Command
             if (!$input->getOption('symlink')) {
                 // Updates composer first
                 $output->writeln("\nInstalling vendor dependencies");
-                $output->writeln(system('php bin/composer.phar --working-dir="'.$this->destination.'" --no-interaction --no-dev --prefer-dist -o install'));
+                $output->writeln($this->composerUpdate(GRAV_ROOT, 'install'));
 
                 $this->gitclone($output);
             } else {
diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php
index 42c65d495..a2e80b6e8 100644
--- a/system/src/Grav/Console/ConsoleTrait.php
+++ b/system/src/Grav/Console/ConsoleTrait.php
@@ -83,6 +83,11 @@ trait ConsoleTrait
         }
     }
 
+    public function composerUpdate($path, $action = 'install')
+    {
+        return system('php bin/composer.phar --working-dir="'.$path.'" --no-interaction --no-dev --prefer-dist -o '. $action);
+    }
+
     /**
      * @param array $all
      *
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 29eb77d58..5ed68ced2 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -154,7 +154,7 @@ class SelfupgradeCommand extends Command
         }
 
         $this->output->writeln("\nInstalling vendor dependencies");
-        $this->output->writeln(system('php bin/composer.phar --working-dir="'.GRAV_ROOT.'" --no-interaction --no-dev --prefer-dist -o install'));
+        $this->output->writeln($this->composerUpdate(GRAV_ROOT, 'update'));
 
         // clear cache after successful upgrade
         $this->clearCache('all');

From 1546783371c6060851c012c17d5c5a30b9197aa2 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 18:10:56 -0600
Subject: [PATCH 13/64] upgrade already has vendor libs

---
 system/src/Grav/Console/Gpm/SelfupgradeCommand.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 5ed68ced2..4d2895312 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -153,9 +153,6 @@ class SelfupgradeCommand extends Command
             $this->output->writeln('');
         }
 
-        $this->output->writeln("\nInstalling vendor dependencies");
-        $this->output->writeln($this->composerUpdate(GRAV_ROOT, 'update'));
-
         // clear cache after successful upgrade
         $this->clearCache('all');
     }

From 67c3d64275ba4e83dcdb0915f68af9c28f009489 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 18:13:53 -0600
Subject: [PATCH 14/64] optimize composer

---
 bin/gpm  | 2 +-
 bin/grav | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/gpm b/bin/gpm
index 26305d3fa..a19fea5d1 100755
--- a/bin/gpm
+++ b/bin/gpm
@@ -9,7 +9,7 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
     echo "Preparing to install vendor dependencies...\n\n";
-    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction install');
+    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 
diff --git a/bin/grav b/bin/grav
index 2d412dd36..1d31dd687 100755
--- a/bin/grav
+++ b/bin/grav
@@ -9,7 +9,7 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
     echo "Preparing to install vendor dependencies...\n\n";
-    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist install');
+    echo system('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 

From d849f8a03ecab8d4dea441dddd84ef650a8d5006 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 26 Apr 2015 18:45:47 -0600
Subject: [PATCH 15/64] Added page level summary header overrides

---
 system/src/Grav/Common/Page/Page.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index e0c7ca963..1d8a80241 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -303,21 +303,25 @@ class Page
     public function summary($size = null)
     {
         /** @var Config $config */
-        $config = self::getGrav()['config'];
+        $config = self::getGrav()['config']->get('site.summary');
         $content = $this->content();
 
+        if (isset($this->header->summary)) {
+            $config = array_merge($config, $this->header->summary);
+        }
+
         // Return summary based on settings in site config file
-        if (!$config->get('site.summary.enabled', true)) {
+        if (!$config['enabled']) {
             return $content;
         }
 
         // Get summary size from site config's file
         if (is_null($size)) {
-            $size = $config->get('site.summary.size', null);
+            $size = $config['size'];
         }
 
         // Return calculated summary based on summary divider's position
-        $format = $config->get('site.summary.format', 'short');
+        $format = $config['format'];
         // Return entire page content on wrong/ unknown format
         if (!in_array($format, array('short', 'long'))) {
             return $content;

From e1d655a3ac3e36b7a0bc6ef68ec2d1261f69588b Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 12:40:30 +0200
Subject: [PATCH 16/64] move backup code into Grav\Common

---
 system/src/Grav/Common/Backup/ZipBackup.php   | 103 ++++++++++++++++++
 system/src/Grav/Console/Cli/BackupCommand.php |  51 ++++-----
 2 files changed, 122 insertions(+), 32 deletions(-)
 create mode 100644 system/src/Grav/Common/Backup/ZipBackup.php

diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
new file mode 100644
index 000000000..1836c56df
--- /dev/null
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -0,0 +1,103 @@
+<?php
+namespace Grav\Common\Backup;
+
+use Grav\Common\GravTrait;
+use Grav\Common\Filesystem\Folder;
+
+/**
+ * The ZipBackup class lets you create simple zip-backups of a grav site
+ *
+ * @author RocketTheme
+ * @license MIT
+ */
+class ZipBackup
+{
+    use GravTrait;
+
+    public static function backup($destination = null, callable $messager = null)
+    {
+        if (!$destination) {
+            $destination = self::getGrav()['locator']->findResource('cache://', true);
+            $destination = $destination . DS . 'tmp/Grav-' . uniqid();
+            Folder::mkdir($destination);
+        }
+
+        $name = basename(GRAV_ROOT);
+
+        if (is_dir($destination)) {
+            $date = date('YmdHis', time());
+            $filename = $name . '-' . $date . '.zip';
+            $destination = rtrim($destination, DS) . DS . $filename;
+        }
+
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => 'Creating new Backup "' . $destination . '"'
+        ]);
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => ''
+        ]);
+
+        $zip = new \ZipArchive();
+        $zip->open($destination, \ZipArchive::CREATE);
+        $zip->addEmptyDir($name);
+
+        static::folderToZip(GRAV_ROOT, $zip, strlen(rtrim(GRAV_ROOT, DS) . DS), $messager);
+
+        $messager && $messager([
+            'type' => 'progress',
+            'percentage' => false,
+            'complete' => true
+        ]);
+
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => ''
+        ]);
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => 'Saving and compressing archive...'
+        ]);
+
+        $zip->close();
+
+        return $destination;
+    }
+
+    /**
+     * @param $folder
+     * @param $zipFile
+     * @param $exclusiveLength
+     * @param $messager
+     */
+    private static function folderToZip($folder, \ZipArchive &$zipFile, $exclusiveLength, callable $messager = null)
+    {
+        $handle = opendir($folder);
+        while (false !== $f = readdir($handle)) {
+            if ($f != '.' && $f != '..') {
+                $filePath = "$folder/$f";
+                // Remove prefix from file path before add to zip.
+                $localPath = substr($filePath, $exclusiveLength);
+                if (is_file($filePath)) {
+                    $zipFile->addFile($filePath, $localPath);
+
+                    $messager && $messager([
+                        'type' => 'progress',
+                        'percentage' => false,
+                        'complete' => false
+                    ]);
+                } elseif (is_dir($filePath)) {
+                    // Add sub-directory.
+                    $zipFile->addEmptyDir($localPath);
+                    static::folderToZip($filePath, $zipFile, $exclusiveLength, $messager);
+                }
+            }
+        }
+        closedir($handle);
+    }
+}
diff --git a/system/src/Grav/Console/Cli/BackupCommand.php b/system/src/Grav/Console/Cli/BackupCommand.php
index 050301762..46590bf39 100644
--- a/system/src/Grav/Console/Cli/BackupCommand.php
+++ b/system/src/Grav/Console/Cli/BackupCommand.php
@@ -7,6 +7,7 @@ use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Grav\Common\Backup\ZipBackup;
 
 /**
  * Class BackupCommand
@@ -23,6 +24,10 @@ class BackupCommand extends Command
      * @var
      */
     protected $progress;
+    /**
+     * @var
+     */
+    protected $output;
 
     /**
      *
@@ -52,6 +57,8 @@ class BackupCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->output = $output;
+
         $output->getFormatter()->setStyle('red', new OutputFormatterStyle('red'));
         $output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan'));
         $output->getFormatter()->setStyle('green', new OutputFormatterStyle('green'));
@@ -60,25 +67,10 @@ class BackupCommand extends Command
         $this->progress = new ProgressBar($output);
         $this->progress->setFormat('Archiving <cyan>%current%</cyan> files [<green>%bar%</green>] %elapsed:6s% %memory:6s%');
 
-        $name = basename($this->source);
-        $dir = dirname($this->source);
-        $date = date('YmdHis', time());
-        $filename = $name . '-' . $date . '.zip';
-
         $destination = ($input->getArgument('destination')) ? $input->getArgument('destination') : ROOT_DIR;
-        $destination = rtrim($destination, DS) . DS . $filename;
 
-        $output->writeln('');
-        $output->writeln('Creating new Backup "' . $destination . '"');
-        $this->progress->start();
+        ZipBackup::backup($destination, [$this, 'output']);
 
-        $zip = new \ZipArchive();
-        $zip->open($destination, \ZipArchive::CREATE);
-        $zip->addEmptyDir($name);
-
-        $this->folderToZip($this->source, $zip, strlen($dir . DS), $this->progress);
-        $zip->close();
-        $this->progress->finish();
         $output->writeln('');
         $output->writeln('');
 
@@ -90,25 +82,20 @@ class BackupCommand extends Command
      * @param $exclusiveLength
      * @param $progress
      */
-    private static function folderToZip($folder, \ZipArchive &$zipFile, $exclusiveLength, ProgressBar $progress)
+    public function output($args)
     {
-        $handle = opendir($folder);
-        while (false !== $f = readdir($handle)) {
-            if ($f != '.' && $f != '..') {
-                $filePath = "$folder/$f";
-                // Remove prefix from file path before add to zip.
-                $localPath = substr($filePath, $exclusiveLength);
-                if (is_file($filePath)) {
-                    $zipFile->addFile($filePath, $localPath);
-                    $progress->advance();
-                } elseif (is_dir($filePath)) {
-                    // Add sub-directory.
-                    $zipFile->addEmptyDir($localPath);
-                    self::folderToZip($filePath, $zipFile, $exclusiveLength, $progress);
+        switch ($args['type']) {
+            case 'message':
+                $this->output->writeln($args['message']);
+                break;
+            case 'progress':
+                if ($args['complete']) {
+                    $this->progress->finish();
+                } else {
+                    $this->progress->advance();
                 }
-            }
+                break;
         }
-        closedir($handle);
     }
 }
 

From bbdb0189f1594900fafb0cb33fba3e2c7e15ec16 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 16:13:48 +0200
Subject: [PATCH 17/64] use site name for backup archive name

---
 system/src/Grav/Common/Backup/ZipBackup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
index 1836c56df..48991b7b5 100644
--- a/system/src/Grav/Common/Backup/ZipBackup.php
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -22,7 +22,7 @@ class ZipBackup
             Folder::mkdir($destination);
         }
 
-        $name = basename(GRAV_ROOT);
+        $name = self::getGrav()['config']->get('site.title', basename(GRAV_ROOT));
 
         if (is_dir($destination)) {
             $date = date('YmdHis', time());

From c481acbb7185c3a0408ade4cc8e7a8d83e07b8cb Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 16:24:17 +0200
Subject: [PATCH 18/64] implement ignore for backups

---
 system/src/Grav/Common/Backup/ZipBackup.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
index 48991b7b5..cdef16efc 100644
--- a/system/src/Grav/Common/Backup/ZipBackup.php
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -14,6 +14,13 @@ class ZipBackup
 {
     use GravTrait;
 
+    protected static $ignore = [
+        '.git',
+        'cache',
+        'images',
+        'logs'
+    ];
+
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
@@ -43,7 +50,6 @@ class ZipBackup
 
         $zip = new \ZipArchive();
         $zip->open($destination, \ZipArchive::CREATE);
-        $zip->addEmptyDir($name);
 
         static::folderToZip(GRAV_ROOT, $zip, strlen(rtrim(GRAV_ROOT, DS) . DS), $messager);
 
@@ -83,6 +89,11 @@ class ZipBackup
                 $filePath = "$folder/$f";
                 // Remove prefix from file path before add to zip.
                 $localPath = substr($filePath, $exclusiveLength);
+
+                if (in_array($localPath, static::$ignore)) {
+                    continue;
+                }
+
                 if (is_file($filePath)) {
                     $zipFile->addFile($filePath, $localPath);
 

From 93f4ad6e5ace9beba5afa7de1f1b26f823b508c4 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 19:29:32 +0200
Subject: [PATCH 19/64] upload limit setting

---
 system/config/system.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/config/system.yaml b/system/config/system.yaml
index 38550d690..d6d84a7ff 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -78,6 +78,7 @@ images:
 
 media:
   enable_media_timestamp: false        # Enable media timetsamps
+  upload_limit: 0                      # Set maximum upload size in bytes (0 is unlimited)
 
 security:
   default_hash: $2y$10$kwsyMVwM8/7j0K/6LHT.g.Fs49xOCTp2b8hh/S5.dPJuJcJB6T.UK

From 5ccefee2889daa2a7e4664d1d7397451d457a8c0 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 21:45:42 +0200
Subject: [PATCH 20/64] backup to backup folder

---
 .gitignore                                     | 2 ++
 backup/.gitkeep                                | 0
 system/src/Grav/Common/Backup/ZipBackup.php    | 8 ++++++--
 system/src/Grav/Common/Config/Config.php       | 6 ++++++
 system/src/Grav/Console/Cli/SandboxCommand.php | 1 +
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 backup/.gitkeep

diff --git a/.gitignore b/.gitignore
index d436576ff..da248e548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ vendor/
 .sass-cache
 
 # Grav Specific
+backup/*
+!backup/.*
 cache/*
 !cache/.*
 assets/*
diff --git a/backup/.gitkeep b/backup/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
index cdef16efc..2951cf9bf 100644
--- a/system/src/Grav/Common/Backup/ZipBackup.php
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -16,6 +16,7 @@ class ZipBackup
 
     protected static $ignore = [
         '.git',
+        'backup',
         'cache',
         'images',
         'logs'
@@ -24,8 +25,11 @@ class ZipBackup
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
-            $destination = self::getGrav()['locator']->findResource('cache://', true);
-            $destination = $destination . DS . 'tmp/Grav-' . uniqid();
+            $destination = self::getGrav()['locator']->findResource('backup://', true);
+
+            if (!$destination)
+                throw new \RuntimeException('The backup folder is missing.');
+
             Folder::mkdir($destination);
         }
 
diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index 1fe373a40..60f443108 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -72,6 +72,12 @@ class Config extends Data
             'prefixes' => [
                 '' => ['logs']
             ]
+        ],
+        'backup' => [
+            'type' => 'Stream',
+            'prefixes' => [
+                '' => ['backup']
+            ]
         ]
     ];
 
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index 4d984d219..ef85e42bb 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -20,6 +20,7 @@ class SandboxCommand extends Command
      * @var array
      */
     protected $directories = array(
+        '/backup',
         '/cache',
         '/logs',
         '/images',

From e364616730b98888d1f969382af548a7debd019c Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 27 Apr 2015 21:53:08 +0200
Subject: [PATCH 21/64] add server directives to block access to backup folder

---
 .htaccess  |   2 +-
 nginx.conf |   6 ++-
 web.config | 106 +++++++++++++++++++++++++++--------------------------
 3 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/.htaccess b/.htaccess
index ce48b2674..ecf1097c0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -44,7 +44,7 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(cache|bin|logs)/(.*) error [L]
+RewriteRule ^(cache|bin|logs|backup)/(.*) error [L]
 # Block access to specific file types for these folders
 RewriteRule ^(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$ error [L]
 ## End - Security
diff --git a/nginx.conf b/nginx.conf
index 12a48054a..afa450c23 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -25,7 +25,7 @@ http {
              	index  index.php;
 		if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
 	}
-	
+
 	location /images/ {
 		# Serve images as static
 	}
@@ -44,6 +44,10 @@ http {
         	rewrite ^/bin/(.*)$ /error redirect;
     	}
 
+        location /backup {
+        rewrite ^/backup/(.*) /error redirect;
+        }
+
     	location /system {
         	rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
     	}
diff --git a/web.config b/web.config
index 85d2c1b1b..c3dd31424 100644
--- a/web.config
+++ b/web.config
@@ -1,51 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <system.webServer>
-        <defaultDocument>
-            <files>
-                <remove value="index.php" />
-                <add value="index.php" />
-            </files>
-        </defaultDocument>
-        <rewrite>
-            <rules>
-                <rule name="request_filename" stopProcessing="true">
-                    <match url="." ignoreCase="false" />
-                    <conditions logicalGrouping="MatchAll">
-                        <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
-                        <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
-                    </conditions>
-                    <action type="Rewrite" url="index.php" />
-                </rule>
-                <rule name="user_accounts" stopProcessing="true">
-                    <match url="^user/accounts/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="user_config" stopProcessing="true">
-                    <match url="^user/config/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="user_error_redirect" stopProcessing="true">
-                    <match url="^user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="cache" stopProcessing="true">
-                    <match url="^cache/(.*)" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="bin" stopProcessing="true">
-                    <match url="^bin/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="system" stopProcessing="true">
-                    <match url="^system/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="vendor" stopProcessing="true">
-                    <match url="^vendor/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-            </rules>
-        </rewrite>
-    </system.webServer>
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <defaultDocument>
+            <files>
+                <remove value="index.php" />
+                <add value="index.php" />
+            </files>
+        </defaultDocument>
+        <rewrite>
+            <rules>
+                <rule name="request_filename" stopProcessing="true">
+                    <match url="." ignoreCase="false" />
+                    <conditions logicalGrouping="MatchAll">
+                        <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
+                        <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+                    </conditions>
+                    <action type="Rewrite" url="index.php" />
+                </rule>
+                <rule name="user_accounts" stopProcessing="true">
+                    <match url="^user/accounts/(.*)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="user_config" stopProcessing="true">
+                    <match url="^user/config/(.*)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="user_error_redirect" stopProcessing="true">
+                    <match url="^user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="cache" stopProcessing="true">
+                    <match url="^cache/(.*)" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="bin" stopProcessing="true">
+                    <match url="^bin/(.*)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="backup" stopProcessing="true">
+                    <match url="^backup/(.*)" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="system" stopProcessing="true">
+                    <match url="^system/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+                <rule name="vendor" stopProcessing="true">
+                    <match url="^vendor/(.*)$" ignoreCase="false" />
+                    <action type="Redirect" url="error" redirectType="Permanent" />
+                </rule>
+            </rules>
+        </rewrite>
+    </system.webServer>
+</configuration>

From 5d38e0fa14bf3c087c90694b2e54c44ac616fc67 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 27 Apr 2015 21:41:52 -0600
Subject: [PATCH 22/64] add a menu sample in site.yaml

---
 system/config/site.yaml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/config/site.yaml b/system/config/site.yaml
index 23c0f1f1b..72bc8027a 100644
--- a/system/config/site.yaml
+++ b/system/config/site.yaml
@@ -1,18 +1,31 @@
 title: Grav                                 # Name of the site
+
 author:
   name: John Appleseed                      # Default author name
   email: 'john@email.com'                   # Default author email
+
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
+
 blog:
-  route: '/blog'                            # Route to blog
+  route: '/blog'                            # Route to blog (deprecated)
+
 metadata:
   description: 'My Grav Site'               # Site description
+
 summary:
   enabled: true                             # enable or disable summary of page
   format: short                             # long = summary delimiter will be ignored; short = use the first occurence of delimter or size
   size: 300                                 # Maximum length of summary (characters)
   delimiter: ===                            # The summary delimiter
+
 routes:
   /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
   /another/one/here: '/blog/sample-3'       # Another alias for /blog/sample-3
   /new/*: '/blog/*'                         # Wildcard any /new/my-page URL to /blog/my-page Route
+
+#menu:                                      # Sample Menu Example
+#    - text: Source
+#      icon: github
+#      url: https://github.com/getgrav/grav
+#    - icon: twitter
+#      url: http://twitter.com/getgrav

From 7acdf231a45b8ce330f01ba805606bf3093e007a Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:21:47 -0600
Subject: [PATCH 23/64] removed php config overrides

---
 system/src/Grav/Common/Utils.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index 830cb6a6b..acb228789 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -185,8 +185,6 @@ abstract class Utils
 
             set_time_limit(0);
             ignore_user_abort(false);
-            ini_set('output_buffering', 0);
-            ini_set('zlib.output_compression', 0);
 
             if ($force_download) {
                 header('Content-Description: File Transfer');

From f7ea2e95e41ce94f180400d3bfdc82dce242ab9b Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:24:46 -0600
Subject: [PATCH 24/64] strict comparison

---
 system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index b3d204232..0f1358216 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -37,7 +37,7 @@ trait ParsedownGravTrait
         $this->pages_dir = self::getGrav()['locator']->findResource('page://');
         $this->special_chars = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
 
-        if ($defaults == null) {
+        if ($defaults === null) {
             $defaults = self::getGrav()['config']->get('system.pages.markdown');
         }
 

From 084e59dc90976fa87c5176c3271ddb947872d7cc Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:26:18 -0600
Subject: [PATCH 25/64] remove unused var

---
 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 17a9663de..bea2b10d6 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -308,7 +308,7 @@ class ImageMedium extends Medium
         }
 
         try {
-            $result = call_user_func_array([$this->image, $method], $args);
+            call_user_func_array([$this->image, $method], $args);
 
             foreach ($this->alternatives as $ratio => $medium) {
                 $args_copy = $args;

From 64bb6ea2ad114ee63e67be1e484d72dfe8593690 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:26:30 -0600
Subject: [PATCH 26/64] remove another unused var

---
 system/src/Grav/Common/Utils.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index acb228789..97e4d6b52 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -181,7 +181,6 @@ abstract class Utils
 
             $file_parts = pathinfo($file);
             $filesize = filesize($file);
-            $range = false;
 
             set_time_limit(0);
             ignore_user_abort(false);

From 491c6d6a1f530e93da61794ef6e0e7532a48164e Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:28:08 -0600
Subject: [PATCH 27/64] fixed missing classes

---
 system/src/Grav/Common/Page/Medium/Link.php   | 2 +-
 system/src/Grav/Common/Page/Medium/Medium.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Medium/Link.php b/system/src/Grav/Common/Page/Medium/Link.php
index 1262bddf9..a92ec228e 100644
--- a/system/src/Grav/Common/Page/Medium/Link.php
+++ b/system/src/Grav/Common/Page/Medium/Link.php
@@ -60,6 +60,6 @@ class Link implements RenderableInterface
 
         // Don't start nesting links, if user has multiple link calls in his
         // actions, we will drop the previous links.
-        return $this->source instanceof LinkMedium ? $this->source : $this;
+        return $this->source instanceof Link ? $this->source : $this;
     }
 }
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index 5c210e563..0eb0666ce 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -399,7 +399,7 @@ class Medium extends Data implements RenderableInterface
                 $thumb = $this->get('thumbnails.' . $type, false);
 
                 if ($thumb) {
-                    $thumb = $thumb instanceof ThumbnailMedium ? $thumb : MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
+                    $thumb = $thumb instanceof ThumbnailImageMedium ? $thumb : MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
                     $thumb->parent = $this;
                 }
 

From 3a25f028dfb8e7807e4bdf407ef432745328d6fc Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:30:03 -0600
Subject: [PATCH 28/64] Commented these out for now

---
 .../src/Grav/Console/Gpm/InstallCommand.php   | 116 +++++++++---------
 1 file changed, 57 insertions(+), 59 deletions(-)

diff --git a/system/src/Grav/Console/Gpm/InstallCommand.php b/system/src/Grav/Console/Gpm/InstallCommand.php
index 60e01196f..f9b6b9a6f 100644
--- a/system/src/Grav/Console/Gpm/InstallCommand.php
+++ b/system/src/Grav/Console/Gpm/InstallCommand.php
@@ -352,65 +352,63 @@ class InstallCommand extends Command
         $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
     }
 
-    /**
-     * @param $package
-     */
-    private function processGit($package)
-    {
-        $matches = $this->getGitRegexMatches($package);
-
-        $to = $this->destination . DS . $package->install_path;
-
-        $this->output->writeln("Preparing to Git clone <cyan>" . $package->name . "</cyan> from " . $matches[0]);
-
-        $this->output->write("  |- Checking destination...  ");
-        $checks = $this->checkDestination($package);
-
-        if (!$checks) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
-        } else {
-            $cmd = 'cd ' . $this->destination . ' && git clone ' . $matches[0] . ' ' . $package->install_path;
-            exec($cmd);
-
-            // extra white spaces to clear out the buffer properly
-            $this->output->writeln("  |- Cloning package...    <green>ok</green>                             ");
-
-            $this->output->writeln("  '- <green>Success!</green>  ");
-            $this->output->writeln('');
-        }
-    }
-
-    /**
-     * @param $package
-     */
-    private function processGPM($package)
-    {
-        $version = isset($package->available) ? $package->available : $package->version;
-
-        $this->output->writeln("Preparing to install <cyan>" . $package->name . "</cyan> [v" . $version . "]");
-
-        $this->output->write("  |- Downloading package...     0%");
-        $this->file = $this->downloadPackage($package);
-
-        $this->output->write("  |- Checking destination...  ");
-        $checks = $this->checkDestination($package);
-
-        if (!$checks) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
-        } else {
-            $this->output->write("  |- Installing package...  ");
-            $installation = $this->installPackage($package);
-            if (!$installation) {
-                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-                $this->output->writeln('');
-            } else {
-                $this->output->writeln("  '- <green>Success!</green>  ");
-                $this->output->writeln('');
-            }
-        }
-    }
+//    /**
+//     * @param $package
+//     */
+//    private function processGit($package)
+//    {
+//        $matches = $this->getGitRegexMatches($package);
+//
+//        $this->output->writeln("Preparing to Git clone <cyan>" . $package->name . "</cyan> from " . $matches[0]);
+//
+//        $this->output->write("  |- Checking destination...  ");
+//        $checks = $this->checkDestination($package);
+//
+//        if (!$checks) {
+//            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+//            $this->output->writeln('');
+//        } else {
+//            $cmd = 'cd ' . $this->destination . ' && git clone ' . $matches[0] . ' ' . $package->install_path;
+//            exec($cmd);
+//
+//            // extra white spaces to clear out the buffer properly
+//            $this->output->writeln("  |- Cloning package...    <green>ok</green>                             ");
+//
+//            $this->output->writeln("  '- <green>Success!</green>  ");
+//            $this->output->writeln('');
+//        }
+//    }
+//
+//    /**
+//     * @param $package
+//     */
+//    private function processGPM($package)
+//    {
+//        $version = isset($package->available) ? $package->available : $package->version;
+//
+//        $this->output->writeln("Preparing to install <cyan>" . $package->name . "</cyan> [v" . $version . "]");
+//
+//        $this->output->write("  |- Downloading package...     0%");
+//        $this->file = $this->downloadPackage($package);
+//
+//        $this->output->write("  |- Checking destination...  ");
+//        $checks = $this->checkDestination($package);
+//
+//        if (!$checks) {
+//            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+//            $this->output->writeln('');
+//        } else {
+//            $this->output->write("  |- Installing package...  ");
+//            $installation = $this->installPackage($package);
+//            if (!$installation) {
+//                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+//                $this->output->writeln('');
+//            } else {
+//                $this->output->writeln("  '- <green>Success!</green>  ");
+//                $this->output->writeln('');
+//            }
+//        }
+//    }
 
     /**
      * @param $package

From 9bce9ce026d994c09bd85b0a5c2c9668a91e5d0f Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 11:31:28 -0600
Subject: [PATCH 29/64] removed unused 'use' statements

---
 system/src/Grav/Common/Grav.php                | 1 -
 system/src/Grav/Console/Cli/SandboxCommand.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 42085cd29..3720170cf 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -1,7 +1,6 @@
 <?php
 namespace Grav\Common;
 
-use Grav\Common\Filesystem\Folder;
 use Grav\Common\Page\Medium\ImageMedium;
 use Grav\Common\Page\Pages;
 use Grav\Common\Service\ConfigServiceProvider;
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index c1e79ecdc..d57c25e8b 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -2,7 +2,6 @@
 namespace Grav\Console\Cli;
 
 use Grav\Common\Filesystem\Folder;
-use Grav\Common\Utils;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;

From bbfc63e94308adb0b48fbcf778e0c3fa12110f38 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Tue, 28 Apr 2015 23:35:58 +0200
Subject: [PATCH 30/64] ignore all .git folders

---
 system/src/Grav/Common/Backup/ZipBackup.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
index 2951cf9bf..d275d21eb 100644
--- a/system/src/Grav/Common/Backup/ZipBackup.php
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -14,14 +14,17 @@ class ZipBackup
 {
     use GravTrait;
 
-    protected static $ignore = [
-        '.git',
+    protected static $ignorePaths = [
         'backup',
         'cache',
         'images',
         'logs'
     ];
 
+    protected static $ignoreFolders = [
+        '.git'
+    ];
+
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
@@ -94,7 +97,7 @@ class ZipBackup
                 // Remove prefix from file path before add to zip.
                 $localPath = substr($filePath, $exclusiveLength);
 
-                if (in_array($localPath, static::$ignore)) {
+                if (in_array($f, static::$ignoreFolders) || in_array($localPath, static::$ignorePaths)) {
                     continue;
                 }
 

From 8404ba7a09ca1004b9c66613b1cd104b5894c55e Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Wed, 29 Apr 2015 01:07:24 +0200
Subject: [PATCH 31/64] gzip

---
 system/src/Grav/Common/Grav.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 33e5a2a28..7ba3ad4cf 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -167,12 +167,6 @@ class Grav extends Container
 
     public function process()
     {
-        // Use output buffering to prevent headers from being sent too early.
-        ob_start();
-        if ($this['config']->get('system.cache.gzip')) {
-            ob_start('ob_gzhandler');
-        }
-
         /** @var Debugger $debugger */
         $debugger = $this['debugger'];
 
@@ -185,6 +179,12 @@ class Grav extends Container
         $this['config']->debug();
         $debugger->stopTimer('_config');
 
+        // Use output buffering to prevent headers from being sent too early.
+        ob_start();
+        if ($this['config']->get('system.cache.gzip')) {
+            ob_start('ob_gzhandler');
+        }
+
         // Initialize the timezone
         if ($this['config']->get('system.timezone')) {
             date_default_timezone_set($this['config']->get('system.timezone'));

From 91a963f58044c819e92e56f84347fe2c4dc56b5a Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 17:21:30 -0600
Subject: [PATCH 32/64] tweaks

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

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 7ba3ad4cf..19d48f396 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -349,26 +349,29 @@ class Grav extends Container
     public function shutdown()
     {
         if ($this['config']->get('system.debugger.shutdown.close_connection')) {
-
+            //stop user abort
             if (function_exists('ignore_user_abort')) {
                 @ignore_user_abort(true);
             }
 
+            // close the session
             if (isset($this['session'])) {
                 $this['session']->close();
             }
 
+            // flush buffer if gzip buffer was started
             if ($this['config']->get('system.cache.gzip')) {
                 ob_end_flush(); // gzhandler buffer
             }
 
+            // get lengh and close the connection
             header('Content-Length: ' . ob_get_length());
             header("Connection: close\r\n");
 
-            ob_end_flush(); // regular buffer
-            @ob_flush();
-            flush();
+            // flush the regular buffer
+            ob_end_flush();
 
+            // fix for fastcgi close connection issue
             if (function_exists('fastcgi_finish_request')) {
                 @fastcgi_finish_request();
             }

From b65280f3c92d65a52a3397248ed52fd3c51e9b0a Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 28 Apr 2015 17:34:59 -0600
Subject: [PATCH 33/64] added other close bits back for gzip close connection

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

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 19d48f396..09a207fb9 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -366,10 +366,12 @@ class Grav extends Container
 
             // get lengh and close the connection
             header('Content-Length: ' . ob_get_length());
-            header("Connection: close\r\n");
+            header("Connection: close");
 
             // flush the regular buffer
             ob_end_flush();
+            @ob_flush();
+            flush();
 
             // fix for fastcgi close connection issue
             if (function_exists('fastcgi_finish_request')) {

From ecc12be5310485e3606633fdcd302ff94b08a80b Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 30 Apr 2015 16:54:23 -0600
Subject: [PATCH 34/64] restored gpm install functions

---
 .../src/Grav/Console/Gpm/InstallCommand.php   | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/system/src/Grav/Console/Gpm/InstallCommand.php b/system/src/Grav/Console/Gpm/InstallCommand.php
index f9b6b9a6f..6e8e40bbe 100644
--- a/system/src/Grav/Console/Gpm/InstallCommand.php
+++ b/system/src/Grav/Console/Gpm/InstallCommand.php
@@ -352,63 +352,63 @@ class InstallCommand extends Command
         $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
     }
 
-//    /**
-//     * @param $package
-//     */
-//    private function processGit($package)
-//    {
-//        $matches = $this->getGitRegexMatches($package);
-//
-//        $this->output->writeln("Preparing to Git clone <cyan>" . $package->name . "</cyan> from " . $matches[0]);
-//
-//        $this->output->write("  |- Checking destination...  ");
-//        $checks = $this->checkDestination($package);
-//
-//        if (!$checks) {
-//            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-//            $this->output->writeln('');
-//        } else {
-//            $cmd = 'cd ' . $this->destination . ' && git clone ' . $matches[0] . ' ' . $package->install_path;
-//            exec($cmd);
-//
-//            // extra white spaces to clear out the buffer properly
-//            $this->output->writeln("  |- Cloning package...    <green>ok</green>                             ");
-//
-//            $this->output->writeln("  '- <green>Success!</green>  ");
-//            $this->output->writeln('');
-//        }
-//    }
-//
-//    /**
-//     * @param $package
-//     */
-//    private function processGPM($package)
-//    {
-//        $version = isset($package->available) ? $package->available : $package->version;
-//
-//        $this->output->writeln("Preparing to install <cyan>" . $package->name . "</cyan> [v" . $version . "]");
-//
-//        $this->output->write("  |- Downloading package...     0%");
-//        $this->file = $this->downloadPackage($package);
-//
-//        $this->output->write("  |- Checking destination...  ");
-//        $checks = $this->checkDestination($package);
-//
-//        if (!$checks) {
-//            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-//            $this->output->writeln('');
-//        } else {
-//            $this->output->write("  |- Installing package...  ");
-//            $installation = $this->installPackage($package);
-//            if (!$installation) {
-//                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-//                $this->output->writeln('');
-//            } else {
-//                $this->output->writeln("  '- <green>Success!</green>  ");
-//                $this->output->writeln('');
-//            }
-//        }
-//    }
+    /**
+     * @param $package
+     */
+    private function processGit($package)
+    {
+        $matches = $this->getGitRegexMatches($package);
+
+        $this->output->writeln("Preparing to Git clone <cyan>" . $package->name . "</cyan> from " . $matches[0]);
+
+        $this->output->write("  |- Checking destination...  ");
+        $checks = $this->checkDestination($package);
+
+        if (!$checks) {
+            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+            $this->output->writeln('');
+        } else {
+            $cmd = 'cd ' . $this->destination . ' && git clone ' . $matches[0] . ' ' . $package->install_path;
+            exec($cmd);
+
+            // extra white spaces to clear out the buffer properly
+            $this->output->writeln("  |- Cloning package...    <green>ok</green>                             ");
+
+            $this->output->writeln("  '- <green>Success!</green>  ");
+            $this->output->writeln('');
+        }
+    }
+
+    /**
+     * @param $package
+     */
+    private function processGPM($package)
+    {
+        $version = isset($package->available) ? $package->available : $package->version;
+
+        $this->output->writeln("Preparing to install <cyan>" . $package->name . "</cyan> [v" . $version . "]");
+
+        $this->output->write("  |- Downloading package...     0%");
+        $this->file = $this->downloadPackage($package);
+
+        $this->output->write("  |- Checking destination...  ");
+        $checks = $this->checkDestination($package);
+
+        if (!$checks) {
+            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+            $this->output->writeln('');
+        } else {
+            $this->output->write("  |- Installing package...  ");
+            $installation = $this->installPackage($package);
+            if (!$installation) {
+                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+                $this->output->writeln('');
+            } else {
+                $this->output->writeln("  '- <green>Success!</green>  ");
+                $this->output->writeln('');
+            }
+        }
+    }
 
     /**
      * @param $package

From 4305bbabd5f22501fb523bfa1f56e1fdaf53de44 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 30 Apr 2015 18:05:30 -0600
Subject: [PATCH 35/64] fix for theme name same as base_url and asset pipeline

---
 system/src/Grav/Common/Assets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index 3b232f457..a2a741239 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -825,7 +825,7 @@ class Assets
             } else {
                 // Fix to remove relative dir if grav is in one
                 if (($this->base_url != '/') && (strpos($this->base_url, $link) == 0)) {
-                    $relative_path = str_replace($this->base_url, '/', $link);
+                    $relative_path = ltrim(preg_replace($this->base_url, '/', $link, 1), '/');
                 }
 
                 $relative_dir = dirname($relative_path);

From 750dfb60dce26dac570efb3d7460f1905444dba4 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 30 Apr 2015 22:51:39 -0600
Subject: [PATCH 36/64] Fix to properly normalize the font rewrite path

---
 system/src/Grav/Common/Assets.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index a2a741239..2d44912a8 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -881,18 +881,7 @@ class Assets
                     return $matches[0];
                 }
 
-                $newpath = array();
-                $paths = explode('/', $old_url);
-
-                foreach ($paths as $path) {
-                    if ($path == '..') {
-                        $relative_path = dirname($relative_path);
-                    } else {
-                        $newpath[] = $path;
-                    }
-                }
-
-                $new_url = rtrim($this->base_url, '/') . $relative_path . '/' . implode('/', $newpath);
+                $new_url = $this->base_url . ltrim(Utils::normalizePath($relative_path . '/' . $old_url), '/');
 
                 return str_replace($old_url, $new_url, $matches[0]);
             },

From 41c00d7fbeb20b9f5a2a9e52b44056722343ba67 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 1 May 2015 06:23:31 -0600
Subject: [PATCH 37/64] fix for absolute url's below this page

---
 system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 0f1358216..0d629be8a 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -232,13 +232,8 @@ trait ParsedownGravTrait
                 $normalized_path = Utils::normalizePath($this->pages_dir . $markdown_url);
                 $normalized_url = Utils::normalizePath($this->base_url . $markdown_url);
             } else {
-                // contains path, so need to normalize it
-                if (Utils::contains($markdown_url, '/')) {
-                    $normalized_path = Utils::normalizePath($this->page->path() . '/' . $markdown_url);
-                } else {
-                    $normalized_path = false;
-                }
                 $normalized_url = $this->base_url . Utils::normalizePath($this->page->route() . '/' . $markdown_url);
+                $normalized_path = Utils::normalizePath($this->page->path() . '/' . $markdown_url);
             }
 
             // if this file exits, get the page and work with that

From c68c39df27773173fc7ef884fee8094e7433df68 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 1 May 2015 06:23:49 -0600
Subject: [PATCH 38/64] fix for .. page references

---
 .../Common/Markdown/ParsedownGravTrait.php    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 0d629be8a..1d7b581dd 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -246,16 +246,23 @@ trait ParsedownGravTrait
                     $page_path = $path_info['dirname'];
                     $filename = '';
 
-                    // save the filename if a file is part of the path
-                    $filename_regex = "/([\w\d-_]+\.([a-zA-Z]{2,4}))$/";
-                    if (preg_match($filename_regex, $full_path, $matches)) {
-                        if ($matches[2] != 'md') {
-                            $filename = '/' . $matches[1];
-                        }
-                    } else {
+
+                    if ($markdown_url == '..') {
                         $page_path = $full_path;
+                    } else {
+                        // save the filename if a file is part of the path
+                        $filename_regex = "/([\w\d-_]+\.([a-zA-Z]{2,4}))$/";
+                        if (preg_match($filename_regex, $full_path, $matches)) {
+                            if ($matches[2] != 'md') {
+                                $filename = '/' . $matches[1];
+                            }
+                        } else {
+                            $page_path = $full_path;
+                        }
                     }
 
+
+
                     // get page instances and try to find one that fits
                     $instances = $this->pages->instances();
                     if (isset($instances[$page_path])) {

From 0563b2b6e58e231f470ca874d88945b4f4258885 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 2 May 2015 11:31:10 -0600
Subject: [PATCH 39/64] fixed missing method name

---
 system/src/Grav/Common/Plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index b6264e9d9..77a2afa2e 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -42,7 +42,7 @@ class Plugins extends Iterator
             }
 
             $locator = self::getGrav()['locator'];
-            $filePath = $locator('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
+            $filePath = $locator->findResource('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
             if (!is_file($filePath)) {
                 self::getGrav()['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
                 continue;

From f12ef84a984b2d688cd45bad93de63974ae98975 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 2 May 2015 14:21:13 -0600
Subject: [PATCH 40/64] Added a function to parseLinks - used by YouTube plugin
 as testbed

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

diff --git a/system/src/Grav/Common/Plugin.php b/system/src/Grav/Common/Plugin.php
index 4197dd192..8643a89c0 100644
--- a/system/src/Grav/Common/Plugin.php
+++ b/system/src/Grav/Common/Plugin.php
@@ -114,6 +114,25 @@ class Plugin implements EventSubscriberInterface
         }
     }
 
+    /**
+     * This function will search a string for markdown links in a specific format.  The link value can be
+     * optionally compared against via the $internal_regex and operated on by the callback $function
+     * provided.
+     *
+     * format: [plugin:myplugin_name](function_data)
+     *
+     * @param        $content           The string to perform operations upon
+     * @param        $function          The anonymous callback function
+     * @param string $internal_regex    Optional internal regex to extra data from
+     *
+     * @return string
+     */
+    protected function parseLinks($content, $function, $internal_regex = '(.*)')
+    {
+        $regex = '/\[plugin:(?:'.$this->name.')\]\('.$internal_regex.'\)/i';
+        return preg_replace_callback($regex, $function, $content);
+    }
+
     /**
      * Merge global and page configurations.
      *

From 2e680cd35a240ab02318a22e7709bb292d115669 Mon Sep 17 00:00:00 2001
From: Gert <gert@gert.gert>
Date: Mon, 4 May 2015 14:56:34 +0200
Subject: [PATCH 41/64] email validate

---
 system/blueprints/config/site.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/blueprints/config/site.yaml b/system/blueprints/config/site.yaml
index 9ec49f43d..604be106d 100644
--- a/system/blueprints/config/site.yaml
+++ b/system/blueprints/config/site.yaml
@@ -24,6 +24,8 @@ form:
                     type: text
                     size: large
                     label: Default Email
+                    validate:
+                        type: email
 
                 taxonomies:
                     type: text

From 08c4fd02d28cba0b5a110f021e16c305b9490cda Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:13:29 +0200
Subject: [PATCH 42/64] fix markdown extra blueprint

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

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 2a3f0119f..3c49b562f 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -27,7 +27,7 @@ form:
                     label: Default Theme
                     help: "Set the theme (defaults to 'default')"
 
-                pages.markdown_extra:
+                pages.markdown.extra:
                     type: toggle
                     label: Markdown Extra
                     highlight: 1

From ce8513d3ff4b948f9ecb1dcf2147ffdbd8bf01bd Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:18:31 +0200
Subject: [PATCH 43/64] timezon and param_sep blueprints

---
 system/blueprints/config/system.yaml | 23 +++++++++++++++++++++++
 system/src/Grav/Common/Utils.php     | 28 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 3c49b562f..7b7bd3d8c 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -362,3 +362,26 @@ form:
                         0: No
                     validate:
                         type: bool
+        system:
+            type: section
+            title: System
+            underline: true
+
+            fields:
+                timezone:
+                    type: select
+                    label: Timezone
+                    classes: fancy
+                    @data-options: '\Grav\Common\Utils::timezones'
+                    default: ''
+                    options:
+                        '': '- None -'
+
+                param_sep:
+                    type: select
+                    label: Parameter separator
+                    classes: fancy
+                    default: ''
+                    options:
+                        ':': ': (default)'
+                        ';': '; (use this for apache on Windows)'
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index 97e4d6b52..ac1a2dcec 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -348,4 +348,32 @@ abstract class Utils
         }
         return $root . implode('/', $ret);
     }
+
+    public static function timezones()
+    {
+        $timezones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
+        $offsets = [];
+        $testDate = new \DateTime;
+
+        foreach ($timezones as $zone) {
+            $tz = new \DateTimeZone($zone);
+            $offsets[$zone] = $tz->getOffset($testDate);
+        }
+
+        asort($offsets);
+
+        $timezone_list = array();
+        foreach( $offsets as $timezone => $offset )
+        {
+            $offset_prefix = $offset < 0 ? '-' : '+';
+            $offset_formatted = gmdate( 'H:i', abs($offset) );
+
+            $pretty_offset = "UTC${offset_prefix}${offset_formatted}";
+
+            $timezone_list[$timezone] = "(${pretty_offset}) $timezone";
+        }
+
+        return $timezone_list;
+
+    }
 }

From 2c51dd5fe17f6de25f029e15166ac009b83ee16b Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:18:55 +0200
Subject: [PATCH 44/64] default ordering fix

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

diff --git a/system/config/system.yaml b/system/config/system.yaml
index d6d84a7ff..98e183b1a 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -8,7 +8,7 @@ home:
 pages:
   theme: antimatter                    # Default theme (defaults to "antimatter" theme)
   order:
-    by: defaults                       # Order pages by "default", "alpha" or "date"
+    by: default                        # Order pages by "default", "alpha" or "date"
     dir: asc                           # Default ordering direction, "asc" or "desc"
   list:
     count: 20                          # Default item count per page

From 58bb5a699324bbe45e417d130dd1e876f67c947b Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:23:08 +0200
Subject: [PATCH 45/64] publish_dates blueprint

---
 system/blueprints/config/system.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 7b7bd3d8c..fb6bb90db 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -101,6 +101,16 @@ form:
                     validate:
                         type: number
                         min: 1
+                pages.publish_dates:
+                    type: toggle
+                    label: Date-based publishing
+                    help: Automatically (un)publish posts based on their date
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
 
 
 

From 4e07c294c552743e141ddca1f74d39e483cb6ea6 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:29:46 +0200
Subject: [PATCH 46/64] gzip compression blueprint

---
 system/blueprints/config/system.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index fb6bb90db..28d9a255d 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -185,6 +185,16 @@ form:
                     label: Cache Prefix
                     placeholder: "Derived from base URL (override by entering random string)"
 
+                cache.gzip:
+                    type: toggle
+                    label: GZIP compression
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
         twig:
             type: section
             title: Twig Templating

From e01a116173cd887b46bf482ce404da9218fe65fa Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:36:17 +0200
Subject: [PATCH 47/64] asset timestamps blueprint

---
 system/blueprints/config/system.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 28d9a255d..81805ed5e 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -307,6 +307,16 @@ form:
                     validate:
                         type: bool
 
+                assets.enable_asset_timestamp:
+                    type: toggle
+                    label: Enable timestamps
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
         debugger:
             type: section
             title: Debugger

From 565a76c31764afcf8f3ff8becfc786ab47bb133c Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:37:07 +0200
Subject: [PATCH 48/64] error handler blueprints

---
 system/blueprints/config/system.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 81805ed5e..f02848221 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -317,6 +317,32 @@ form:
                     validate:
                         type: bool
 
+        errors:
+            type: section
+            title: Error handler
+            underline: true
+
+            fields:
+                errors.display:
+                    type: toggle
+                    label: Display errors
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
+                errors.log:
+                    type: toggle
+                    label: Log errors
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
         debugger:
             type: section
             title: Debugger
@@ -392,6 +418,7 @@ form:
                         0: No
                     validate:
                         type: bool
+
         system:
             type: section
             title: System

From 845da953e1150d82537462206e87052d3ffef90f Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:39:33 +0200
Subject: [PATCH 49/64] timestamp blueprints under caching header

---
 system/blueprints/config/system.yaml | 30 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index f02848221..890613cc5 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -195,6 +195,26 @@ form:
                     validate:
                         type: bool
 
+                assets.enable_asset_timestamp:
+                    type: toggle
+                    label: Enable timestamps on assets
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
+                media.enable_media_timestamp:
+                    type: toggle
+                    label: Enable timestamps on media
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
         twig:
             type: section
             title: Twig Templating
@@ -307,16 +327,6 @@ form:
                     validate:
                         type: bool
 
-                assets.enable_asset_timestamp:
-                    type: toggle
-                    label: Enable timestamps
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
         errors:
             type: section
             title: Error handler

From 4b56a05f57a8dc79d7bac263b2277866a3cb5a29 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:44:25 +0200
Subject: [PATCH 50/64] media blueprints

---
 system/blueprints/config/system.yaml | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 890613cc5..56712a4c8 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -429,6 +429,38 @@ form:
                     validate:
                         type: bool
 
+        media:
+            type: section
+            title: Media
+            underline: true
+
+            fields:
+                images.default_image_quality:
+                    type: text
+                    label: Default image quality
+                    classes: x-small
+                    validate:
+                        tpye: number
+                        min: 1
+                        max: 100
+
+                images.debug:
+                    type: toggle
+                    label: Image debug watermark
+                    highlight: 1
+                    options:
+                        1: Yes
+                        0: No
+                    validate:
+                        type: bool
+
+                media.upload_limit:
+                    type: text
+                    label: File upload limit
+                    classes: small
+                    validate:
+                        tpye: number
+
         system:
             type: section
             title: System

From 3ec855e28fc0f5671e64ffffbc3bec9cf8252630 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:58:39 +0200
Subject: [PATCH 51/64] fix typo in type

---
 system/blueprints/config/system.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 56712a4c8..071a5c1b2 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -440,7 +440,7 @@ form:
                     label: Default image quality
                     classes: x-small
                     validate:
-                        tpye: number
+                        type: number
                         min: 1
                         max: 100
 
@@ -459,7 +459,7 @@ form:
                     label: File upload limit
                     classes: small
                     validate:
-                        tpye: number
+                        type: number
 
         system:
             type: section

From e62133233c7dc81a07bfed994657b55ed6f724ed Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 15:59:06 +0200
Subject: [PATCH 52/64] remove permission management from user settings

---
 system/blueprints/user/account.yaml | 45 -----------------------------
 1 file changed, 45 deletions(-)

diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 821d5d7bc..7ed36145a 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -28,8 +28,6 @@ form:
                     validate:
                       required: true
 
-
-
                 fullname:
                     type: text
                     size: large
@@ -41,46 +39,3 @@ form:
                     type: text
                     size: large
                     label: Title
-
-        admin:
-            type: section
-            title: Admin Access
-
-            fields:
-                access.admin.super:
-                    type: toggle
-                    label: Super user
-                    default: 0
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-                access.admin.login:
-                    type: toggle
-                    label: Admin login
-                    default: 0
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-        site:
-            type: section
-            title: Site Access
-
-            fields:
-                access.site.login:
-                    type: toggle
-                    label: Site login
-                    default: 1
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool

From 13e9e6f5e1e3d76a2e4c6b76893a611789d9ab32 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 17:12:24 +0200
Subject: [PATCH 53/64] modular page cannot be added to root

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

diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index 8e008ac60..f7877772f 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -61,7 +61,7 @@ form:
                       @data-options: '\Grav\Common\Page\Pages::parents'
                       @data-default: '\Grav\Plugin\admin::route'
                       options:
-                        '/': '- Root -'
+                        '': '- Select -'
                       validate:
                         required: true
 

From 9792c9a84edf2c610dc78ddc895e2d1c38b24113 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Mon, 4 May 2015 17:42:53 +0200
Subject: [PATCH 54/64] re-add size property to media

---
 system/src/Grav/Common/Page/Media.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 93c8ddb04..c766b0992 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -58,27 +58,31 @@ class Media extends Getters
 
             if ($type === 'alternative') {
                 $media["{$basename}.{$ext}"][$type] = isset($media["{$basename}.{$ext}"][$type]) ? $media["{$basename}.{$ext}"][$type] : [];
-                $media["{$basename}.{$ext}"][$type][$extra] = $path;
+                $media["{$basename}.{$ext}"][$type][$extra] = [ 'file' => $path, 'size' => $info->getSize() ];
             } else {
-                $media["{$basename}.{$ext}"][$type] = $path;
+                $media["{$basename}.{$ext}"][$type] = [ 'file' => $path, 'size' => $info->getSize() ];
             }
         }
 
         foreach ($media as $name => $types) {
             // First prepare the alternatives in case there is no base medium
             if (!empty($types['alternative'])) {
-                foreach ($types['alternative'] as $ratio => &$file) {
-                    $file = MediumFactory::fromFile($file);
+                foreach ($types['alternative'] as $ratio => &$alt) {
+                    $alt['file'] = MediumFactory::fromFile($alt['file']);
+                    $alt['file']->set('size', $alt['size']);
                 }
             }
 
             // Create the base medium
             if (!empty($types['base'])) {
-                $medium = MediumFactory::fromFile($types['base']);
+                $medium = MediumFactory::fromFile($types['base']['file']);
+                $medium->set('size', $types['base']['size']);
             } else if (!empty($types['alternative'])) {
                 $altMedium = reset($types['alternative']);
                 $ratio = key($types['alternative']);
 
+                $altMedium = $altMedium['file'];
+
                 $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1);
             }
 
@@ -87,13 +91,13 @@ class Media extends Getters
             }
 
             if (!empty($types['meta'])) {
-                $medium->addMetaFile($types['meta']);
+                $medium->addMetaFile($types['meta']['file']);
             }
 
             if (!empty($types['thumb'])) {
                 // We will not turn it into medium yet because user might never request the thumbnail
                 // not wasting any resources on that, maybe we should do this for medium in general?
-                $medium->set('thumbnails.page', $types['thumb']);
+                $medium->set('thumbnails.page', $types['thumb']['file']);
             }
 
             // Build missing alternatives

From 7f8e8f67a5539ec17ed1a4339e3b3a030da8d971 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Tue, 5 May 2015 19:49:14 +0200
Subject: [PATCH 55/64] check if medium was created before setting size

---
 system/src/Grav/Common/Page/Media.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index c766b0992..05705711e 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -69,14 +69,19 @@ class Media extends Getters
             if (!empty($types['alternative'])) {
                 foreach ($types['alternative'] as $ratio => &$alt) {
                     $alt['file'] = MediumFactory::fromFile($alt['file']);
-                    $alt['file']->set('size', $alt['size']);
+
+                    if (!$alt['file']) {
+                        unset($types['alternative'][$ratio]);
+                    } else {
+                        $alt['file']->set('size', $alt['size']);
+                    }
                 }
             }
 
             // Create the base medium
             if (!empty($types['base'])) {
                 $medium = MediumFactory::fromFile($types['base']['file']);
-                $medium->set('size', $types['base']['size']);
+                $medium && $medium->set('size', $types['base']['size']);
             } else if (!empty($types['alternative'])) {
                 $altMedium = reset($types['alternative']);
                 $ratio = key($types['alternative']);

From 16c3a3690b2a00d566390df96606d38f08f1b46a Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Tue, 5 May 2015 20:33:47 +0200
Subject: [PATCH 56/64] ignore .DS_Store in media lookup

---
 system/src/Grav/Common/Page/Media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 05705711e..d73064618 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -47,7 +47,7 @@ class Media extends Getters
         /** @var \DirectoryIterator $info */
         foreach ($iterator as $path => $info) {
             // Ignore folders and Markdown files.
-            if (!$info->isFile() || $info->getExtension() == 'md') {
+            if (!$info->isFile() || $info->getExtension() == 'md' || $info->getBasename() === '.DS_Store') {
                 continue;
             }
 

From b2a78d587c81884de6bc300c489a228b664cf302 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 5 May 2015 12:48:15 -0600
Subject: [PATCH 57/64] added check to see if on same page

---
 system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 1d7b581dd..c265bf599 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -236,6 +236,12 @@ trait ParsedownGravTrait
                 $normalized_path = Utils::normalizePath($this->page->path() . '/' . $markdown_url);
             }
 
+            // special check to see if path checking is required.
+            $just_path = str_replace($normalized_url, '', $normalized_path);
+            if ($just_path == $this->page->path()) {
+                return $normalized_url;
+            }
+
             // if this file exits, get the page and work with that
             if ($normalized_path) {
                 $url_bits = parse_url($normalized_path);

From 14767a3e11622348d87ecbe09a81bd0bbe358cde Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 7 May 2015 14:13:05 -0600
Subject: [PATCH 58/64] added twig filters for starts_with and ends_with

---
 system/src/Grav/Common/TwigExtension.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/TwigExtension.php b/system/src/Grav/Common/TwigExtension.php
index cfec33ba7..c9d5f2289 100644
--- a/system/src/Grav/Common/TwigExtension.php
+++ b/system/src/Grav/Common/TwigExtension.php
@@ -52,7 +52,9 @@ class TwigExtension extends \Twig_Extension
             new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
             new \Twig_SimpleFilter('nicetime', [$this, 'nicetimeFilter']),
             new \Twig_SimpleFilter('absolute_url', [$this, 'absoluteUrlFilter']),
-            new \Twig_SimpleFilter('markdown', [$this, 'markdownFilter'])
+            new \Twig_SimpleFilter('markdown', [$this, 'markdownFilter']),
+            new \Twig_SimpleFilter('starts_with', [$this, 'startsWithFilter']),
+            new \Twig_SimpleFilter('ends_with', [$this, 'endsWithFilter'])
         ];
     }
 
@@ -347,6 +349,16 @@ class TwigExtension extends \Twig_Extension
         return $string;
     }
 
+    public function startsWithFilter($needle, $haystack)
+    {
+        return Utils::startsWith($needle, $haystack);
+    }
+
+    public function endsWithFilter($needle, $haystack)
+    {
+        return Utils::endsWith($needle, $haystack);
+    }
+
     /**
      * Repeat given string x times.
      *

From 57c588521681c4f33979947ff096626c8c75287d Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 7 May 2015 16:01:11 -0600
Subject: [PATCH 59/64] don't cache twig template when you pass params

---
 system/src/Grav/Common/Twig.php | 6 ++++++
 system/src/Grav/Common/Uri.php  | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Twig.php b/system/src/Grav/Common/Twig.php
index e5a7fafbd..6a92f86a0 100644
--- a/system/src/Grav/Common/Twig.php
+++ b/system/src/Grav/Common/Twig.php
@@ -292,6 +292,12 @@ class Twig
         $twig_vars['content'] = $page->content();
         $ext = '.' . ($format ? $format : 'html') . TWIG_EXT;
 
+        // determine if params are set, if so disable twig cache
+        $params = $this->grav['uri']->params(null, true);
+        if (!empty($params)) {
+            $this->twig->setCache(false);
+        }
+
         // Get Twig template layout
         $template = $this->template($page->template() . $ext);
 
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index bacd14b38..c4297bc20 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -193,20 +193,27 @@ class Uri
      * Return all or a single query parameter as a URI compatible string.
      *
      * @param  string  $id  Optional parameter name.
+     * @param  boolean $array return the array format or not
      * @return null|string
      */
-    public function params($id = null)
+    public function params($id = null, $array = false)
     {
         $config = Grav::instance()['config'];
 
         $params = null;
         if ($id === null) {
+            if ($array) {
+                return $this->params;
+            }
             $output = array();
             foreach ($this->params as $key => $value) {
                 $output[] = $key . $config->get('system.param_sep') . $value;
                 $params = '/'.implode('/', $output);
             }
         } elseif (isset($this->params[$id])) {
+            if ($array) {
+                return $this->params[$id];
+            }
             $params = "/{$id}". $config->get('system.param_sep') . $this->params[$id];
         }
 

From 718d443d5219ad32eb9a4de32eb2b88348311571 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Sat, 9 May 2015 15:07:15 +0200
Subject: [PATCH 60/64] trim trailing slashes from path during page lookup
 [fixes #190]

---
 system/src/Grav/Common/Grav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 09a207fb9..d62290114 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -101,7 +101,7 @@ class Grav extends Container
             /** @var Uri $uri */
             $uri = $c['uri'];
 
-            $path = $uri->path();
+            $path = rtrim($uri->path(), '/');
 
             $page = $pages->dispatch($path);
 

From cabec818e286240e3cb87c93abf7682bec036205 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Sat, 9 May 2015 16:08:33 +0200
Subject: [PATCH 61/64] make sure lookup path does not become empty (root
 sites)

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

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index d62290114..710984aca 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -102,6 +102,7 @@ class Grav extends Container
             $uri = $c['uri'];
 
             $path = rtrim($uri->path(), '/');
+            $path = $path ?: '/';
 
             $page = $pages->dispatch($path);
 

From cea130700d6c0dfe8749cdc5b502e1411c4baeb0 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 9 May 2015 12:36:22 -0600
Subject: [PATCH 62/64] composer.par updated to latest

---
 bin/composer.phar | Bin 1098591 -> 1103856 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/composer.phar b/bin/composer.phar
index f3d065ad9b311e025c02b25fde40e2ded287b53d..a08ea4eba3ab936bd19cef6df49d344601a2bce0 100755
GIT binary patch
delta 21967
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
BcUJ%a

delta 20044
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


From e9ebe3b533fc101e00aa71a75e300e62acd84512 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 9 May 2015 12:53:29 -0600
Subject: [PATCH 63/64] updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ce9860c7..7e914ad1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+# v0.9.27
+## 05/09/2015
+
+1. [](#new)
+    * Added new composer CLI command
+    * Added page-level summary header overrides
+    * Added `size` back for Media objects
+    * Refactored Backup command in preparation for admin plugin
+    * Added a new `parseLinks` method to Plugins class
+    * Added `starts_with` and `ends_with` Twig filters
+2. [](#improved)
+    * Opitmized install of vendor libraries for speed improvement
+    * Improved configuration handling in preparation for admin plugin
+    * Cache optimization: Don't cache Twig templates when you pass dynamic params
+    * Moved `Utils::rcopy` to `Folder::rcopy`
+    * Improved `Folder::doDelete`
+    * Added check for required Curl in GPM
+    * Updated included composer.phar to latest version
+    * Various blueprint fixes for admin plugin
+    * Various PSR and code cleanup tasks
+3. [](#bugfix)
+    * Fix issue with Gzip not working with `onShutDown()` event
+    * Fix for URLs with trailing slashes
+    * Handle condition where certain errors resulted in blank page
+    * Fix for issue with theme name equal to base_url and asset pipeline
+    * Fix to properly nomralize font rewrite path
+    * Fix for absolute URLs below the current page
+    * Fix for `..` page references
+
 # v0.9.26
 ## 04/24/2015
 

From e026ba32f49234d3e4d556372b7b32fd7accefbd Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 9 May 2015 13:14:23 -0600
Subject: [PATCH 64/64] version update

---
 system/defines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/defines.php b/system/defines.php
index 2055be734..71aa234fd 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.26');
+define('GRAV_VERSION', '0.9.27');
 define('DS', '/');
 
 // Directories and Paths