tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'silverstripe/3.2' into 3

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Daniel Hensby 2015-07-20 15:20:19 +01:00
commit 5e20faa72a
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
composer.json
View File

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

2
index.php
View File

@ -4,7 +4,7 @@
************************************************************************************ ************************************************************************************
** ** ** **
** If you can read this text in your browser then you don't have PHP installed. ** ** 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+. **
** ** ** **
************************************************************************************ ************************************************************************************
************************************************************************************/ ************************************************************************************/

2
install.php
View File

@ -4,7 +4,7 @@
************************************************************************************ ************************************************************************************
** ** ** **
** If you can read this text in your browser then you don't have PHP installed. ** ** 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+. **
** ** ** **
************************************************************************************ ************************************************************************************
************************************************************************************/ ************************************************************************************/

2
web.config
View File

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