Merge branch 'release/1.0.4'

getgrav · Dec 12, 2015 · 747daa4 · 747daa4
2 parents 4a5a400 + 653edb0
commit 747daa4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.4
+## 12/12/2015
+
+1. [](#bugfix)
+    * Needed to put default image folder permissions for YAML compatibility
+
 # v1.0.3
 ## 12/11/2015
 

diff --git a/system/config/system.yaml b/system/config/system.yaml
@@ -97,7 +97,7 @@ debugger:
 images:
   default_image_quality: 85                 # Default image quality to use when resampling images (85%)
   cache_all: false                          # Cache all image by default
-  cache_perms: 0755                         # Default cache folder perms. Usually 0755 or 0775 depending on setup
+  cache_perms: '0755'                       # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                              # Show an overlay over images indicating the pixel depth of the image when working with retina for example
 
 media:

diff --git a/system/defines.php b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.3');
+define('GRAV_VERSION', '1.0.4');
 define('DS', '/');
 
 // Directories and Paths

diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -93,7 +93,7 @@ class CleanCommand extends Command
         'vendor/maximebf/debugbar/bower.json',
         'vendor/maximebf/debugbar/composer.json',
         'vendor/maximebf/debugbar/.bowerrc',
-        'vendor/maximebf/debugbar/src/Debugbar/Resources/vendor',
+        'vendor/maximebf/debugbar/src/DebugBar/Resources/vendor',
         'vendor/maximebf/debugbar/demo',
         'vendor/maximebf/debugbar/docs',
         'vendor/maximebf/debugbar/tests',

diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -162,7 +162,7 @@ private function copy()
             $to = $this->destination . $target;
 
             $this->output->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
-            Folder::rcopy($from, $to);
+            @Folder::rcopy($from, $to);
         }
     }