Merge branch 'release/0.9.7'

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.9.7 beta
+## 11/24/2014
+
+1. [](#improved)
+    * Nginx configuration updated
+    * Added gitter.im badge to README
+    * Removed `set_time_limit()` and put checks around `ignore_user_abort`
+    * More PSR code fixes
+2. [](#bugfix)
+    * Fix issue with non-valid asset path showing up when they shouldn't
+    * Fix for JS asset pipeline and scripts that don't end in `;`
+    * Fix for schema-based markdown URLs broken routes (eg `mailto:`)
+
 # v0.9.6 beta
 ## 11/17/2014
 

README.md

@@ -1,4 +1,5 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principals to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 

nginx.conf

@@ -27,26 +27,26 @@ http {
 	}
 
 	location /user {
-		rewrite ^/user/accounts/(.*)$ /error redirect;
-		rewrite ^/user/config/(.*)$ /error redirect;
-		rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-	}
-
-	location /cache {
-		rewrite ^/cache/(.*) /error redirect;
-	}
-
-	location /bin {
-		rewrite ^/bin/(.*)$ /error redirect;
-	}
-
-	location /system {
-		rewrite ^/system/(.*)$ /error redirect;
-	}
-
-	location /vendor {
-		rewrite ^/vendor/(.*)$ /error redirect;
-	}
+        rewrite ^/user/accounts/(.*)$ /error redirect;
+        rewrite ^/user/config/(.*)$ /error redirect;
+        rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+    }
+
+    location /cache {
+        rewrite ^/cache/(.*) /error redirect;
+    }
+
+    location /bin {
+        rewrite ^/bin/(.*)$ /error redirect;
+    }
+
+    location /system {
+        rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+    }
+
+    location /vendor {
+        rewrite ^/vendor/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+    }
 
 	# Remember to change 127.0.0.1:9000 to the Ip/port
 	# you configured php-cgi.exe to run from

system/config/system.yaml

@@ -1,4 +1,4 @@
-absolute_urls: false                   # Whether to use absolute URLs.
+absolute_urls: false                   # Absolute or relative URLs for `base_url`
 
 home:
   alias: '/home'                       # Default path for home, ie /

system/defines.php

@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.6');
+define('GRAV_VERSION', '0.9.7');
 define('DS', '/');
 
 // Directories and Paths