Merge branch '3'

.gitignore

@@ -1,10 +1,11 @@
-assets/*
+# ignore cache folder
+/silverstripe-cache/
+
+# ignore all environment files
 _ss_environment.php
-tools/phing-metadata
+
-silverstripe-cache
+# ignore build tools
-.buildpath
+/tools/phing-metadata
-.project
+
-.settings
+# ignore composer vendor folder
-.idea
+/vendor/
-.DS_Store
-vendor/

assets/.gitignore

@@ -0,0 +1,4 @@
+# Ignore sensible defaults
+/*/
+/error-*.html
+/_combinedfiles/

assets/.htaccess

@@ -22,7 +22,7 @@
 # Please note Apache 1.3 does not support regular expression case insensitive matches using PCRE style.
 #
 Deny from all
-<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|dotx|dotm|txt|rtf|xls|xlsx|xltx|xltm|pages|ppt|pptx|potx|potm|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf|gpx|kml)$">
+<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|dotx|dotm|txt|rtf|xls|xlsx|xltx|xltm|pages|ppt|pptx|potx|potm|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|svg|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf|gpx|kml)$">
 	Allow from all
 </FilesMatch>
 

composer.json

@@ -2,13 +2,15 @@
 	"name": "silverstripe/installer",
 	"description": "The SilverStripe Framework Installer",
 	"require": {
-		"php": ">=5.3.2",
+		"php": ">=5.3.3",
 		"silverstripe/cms": "self.version",
 		"silverstripe/framework": "self.version",
-		"silverstripe-themes/simple": "*"
+		"silverstripe/reports": "self.version",
+		"silverstripe/siteconfig": "self.version",
+		"silverstripe-themes/simple": "3.1.*"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7@stable"
+		"phpunit/PHPUnit": "~3.7"
 	},
 	"extra": {
 		"branch-alias": {
@@ -18,5 +20,6 @@
 	"config": {
 		"process-timeout": 600
 	},
+	"prefer-stable": true,
 	"minimum-stability": "dev"
 }

index.php

@@ -4,7 +4,7 @@
  ************************************************************************************
  **                                                                                **
  **  If you can read this text in your browser then you don't have PHP installed.  **
- **  Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+.                    **
+ **  Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+.                    **
  **                                                                                **
  ************************************************************************************
  ************************************************************************************/

install.php

@@ -4,7 +4,7 @@
  ************************************************************************************
  **                                                                                **
  **  If you can read this text in your browser then you don't have PHP installed.  **
- **  Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+.                    **
+ **  Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+.                    **
  **                                                                                **
  ************************************************************************************
  ************************************************************************************/

web.config

@@ -1,4 +1,4 @@
-<--! Routing configuration for Microsoft IIS web server -->
+<!-- Routing configuration for Microsoft IIS web server -->
 <configuration>
 	<system.webServer>
 		<security>