tonyair
/
silverstripe-installer
mirror of https://github.com/silverstripe/silverstripe-installer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1' 

Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-05-31 18:10:15 +02:00
parent f35ca6470c f283290e2a
commit 6b8192e7bd
10 changed files with 261 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitattributes vendored Normal file
View File

@ -0,0 +1,13 @@
.gitattributes export-ignore
behat.yml export-ignore
build.properties.default export-ignore
build.xml export-ignore
changelog-definitions.default export-ignore
CONTRIBUTING.md export-ignore
dependent-modules.default export-ignore
Makefile export-ignore
phpunit.teamcity.mssql.xml export-ignore
phpunit.teamcity.postgresql.xml export-ignore
phpunit.teamcity.sqlite3.xml export-ignore
phpunit.teamcity.xml export-ignore
phpunit.xml.dist export-ignore

1
.gitignore vendored
View File

@ -8,4 +8,3 @@ silverstripe-cache
.idea
.DS_Store
vendor/
composer.lock

2
CONTRIBUTING.md
View File

@ -15,7 +15,7 @@ For submitting patches, please read our [guide to contributing code](http://doc.
* [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)

4
README.md
View File

@ -2,7 +2,7 @@
Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Requires additional modules to function:
* [`framework`](http://github.com/silverstripe/sapphire): Module including the base framework
* [`framework`](http://github.com/silverstripe/silverstripe-framework): Module including the base framework
* [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System
* `themes/simple` (optional)
@ -23,7 +23,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an
## Links ##
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)

2
assets/.htaccess
View File

@ -23,7 +23,7 @@
# does not support regular expression case insensitive matches using PCRE style.
#
Deny from all
<FilesMatch "\.(html|HTML|htm|HTM|xhtml|XHTML|js|JS|css|CSS|bmp|BMP|png|PNG|gif|GIF|jpg|JPG|jpeg|JPEG|ico|ICO|pcx|PCX|tif|TIF|tiff|TIFF|au|AU|mid|MID|midi|MIDI|mpa|MPA|mp3|MP3|ogg|OGG|m4a|M4A|ra|RA|wma|WMA|wav|WAV|cda|CDA|avi|AVI|mpg|MPG|mpeg|MPEG|asf|ASF|wmv|WMV|m4v|M4V|mov|MOV|mkv|MKV|mp4|MP4|swf|SWF|flv|FLV|ram|RAM|rm|RM|doc|DOC|docx|DOCX|txt|TXT|rtf|RTF|xls|XLS|xlsx|XLSX|pages|PAGES|ppt|PPT|pptx|PPTX|pps|PPS|csv|CSV|cab|CAB|arj|ARJ|tar|TAR|zip|ZIP|zipx|ZIPX|sit|SIT|sitx|SITX|gz|GZ|tgz|TGZ|bz2|BZ2|ace|ACE|arc|ARC|pkg|PKG|dmg|DMG|hqx|HQX|jar|JAR|xml|XML|pdf|PDF)$">
<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|txt|rtf|xls|xlsx|pages|ppt|pptx|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf)$">
Allow from all
</FilesMatch>

2
assets/web.config
View File

@ -57,6 +57,8 @@ directory.
<add fileExtension=".mov" allowed="true" />
<add fileExtension=".mkv" allowed="true" />
<add fileExtension=".mp4" allowed="true" />
<add fileExtension=".ogv" allowed="true" />
<add fileExtension=".webm" allowed="true" />
<add fileExtension=".swf" allowed="true" />
<add fileExtension=".flv" allowed="true" />
<add fileExtension=".ram" allowed="true" />

14
behat.yml
View File

@ -1,13 +1,9 @@
default:
extensions:
SilverStripe\BehatExtension\Extension:
framework_path: framework
Behat\MinkExtension\Extension:
# Adjust this to your own website URL.
# Uncomment, or set through environment variable:
# > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/"
SilverStripe\BehatExtension\MinkExtension:
# Adjust "base_url" to your own website URL.
# Can be set via environment variables or _ss_environment.php/$_FILE_TO_URL_MAPPING as well.
#
# base_url: http://localhost/
@ -17,4 +13,6 @@ default:
javascript_session: selenium2
goutte: ~
selenium2:
browser: firefox
browser: firefox
SilverStripe\BehatExtension\Extension: ~

19
composer.json
View File

@ -3,20 +3,17 @@
"description": "The SilverStripe Framework Installer",
"require": {
"php": ">=5.3.2",
"silverstripe/cms": "dev-master",
"silverstripe/framework": "dev-master",
"silverstripe/cms": "self.version",
"silverstripe/framework": "self.version",
"silverstripe-themes/simple": "*"
},
"require-dev": {
"silverstripe/docsviewer": "*",
"silverstripe/behat-extension": "*",
"silverstripe/buildtools": "*",
"phpunit/phpunit": "3.7.*"
},
"extra": {
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev"
}
"dev-master": "3.2.x-dev"
},
"scripts": {
"post-install-cmd": "php ./framework/cli-script.php dev/build",
"post-update-cmd": "php ./framework/cli-script.php dev/build"
},
"minimum-stability": "dev"
}

226
composer.lock generated Normal file
View File

@ -0,0 +1,226 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "351c3c25e8ad3f3e9bec6672374d4746",
"packages": [
{
"name": "composer/installers",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
"reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1",
"reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1",
"shasum": ""
},
"replace": {
"shama/baton": "*"
},
"require-dev": {
"composer/composer": "1.0.*@dev",
"phpunit/phpunit": "3.7.*"
},
"type": "composer-installer",
"extra": {
"class": "Composer\\Installers\\Installer",
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-0": {
"Composer\\Installers\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kyle Robinson Young",
"email": "kyle@dontkry.com",
"homepage": "https://github.com/shama",
"role": "Developer"
}
],
"description": "A multi-framework Composer library installer",
"homepage": "http://composer.github.com/installers/",
"keywords": [
"TYPO3 Flow",
"TYPO3 Neos",
"agl",
"cakephp",
"codeigniter",
"drupal",
"fuelphp",
"installer",
"joomla",
"kohana",
"laravel",
"li3",
"lithium",
"mako",
"phpbb",
"ppi",
"silverstripe",
"symfony",
"wordpress",
"zend"
],
"time": "2013-05-25 02:21:36"
},
{
"name": "silverstripe-themes/simple",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/silverstripe-themes/silverstripe-simple.git",
"reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe-themes/silverstripe-simple/zipball/0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3",
"reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3",
"shasum": ""
},
"require": {
"composer/installers": "*",
"silverstripe/framework": ">=3.0"
},
"type": "silverstripe-theme",
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sara Tušar (Innovaif)",
"homepage": "http://www.saratusar.com"
}
],
"description": "The SilverStripe simple theme (default SilverStripe 3 theme)",
"keywords": [
"silverstripe",
"theme"
],
"time": "2013-05-08 06:38:58"
},
{
"name": "silverstripe/cms",
"version": "3.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-cms.git",
"reference": "206f09ab652faf73a2cb1b28d2b2026021745233"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-cms/zipball/206f09ab652faf73a2cb1b28d2b2026021745233",
"reference": "206f09ab652faf73a2cb1b28d2b2026021745233",
"shasum": ""
},
"require": {
"composer/installers": "*",
"php": ">=5.3.2",
"silverstripe/framework": "3.1.*"
},
"type": "silverstripe-module",
"autoload": {
"classmap": [
"tests/behat/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"description": "The SilverStripe Content Management System",
"homepage": "http://silverstripe.org",
"keywords": [
"cms",
"silverstripe"
],
"time": "2013-05-27 22:04:22"
},
{
"name": "silverstripe/framework",
"version": "3.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "a29c51d2db2ff4d4472c61ad5075b7f6eba4d13f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/a29c51d2db2ff4d4472c61ad5075b7f6eba4d13f",
"reference": "a29c51d2db2ff4d4472c61ad5075b7f6eba4d13f",
"shasum": ""
},
"require": {
"composer/installers": "*",
"php": ">=5.3.2"
},
"type": "silverstripe-module",
"autoload": {
"classmap": [
"tests/behat/features/bootstrap"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"description": "The SilverStripe framework",
"homepage": "http://silverstripe.org",
"keywords": [
"framework",
"silverstripe"
],
"time": "2013-05-30 04:13:22"
}
],
"packages-dev": [
],
"aliases": [
],
"minimum-stability": "dev",
"stability-flags": {
"silverstripe/cms": 20,
"silverstripe/framework": 20
},
"platform": {
"php": ">=5.3.2"
},
"platform-dev": [
]
}

4
web.config
View File

@ -3,7 +3,7 @@
<security>
<requestFiltering>
<hiddenSegments>
<add segment="silverstripe-cache/" />
<add segment="silverstripe-cache" />
<add segment="vendor" />
<add segment="composer.json" />
<add segment="composer.lock" />
@ -15,4 +15,4 @@
</requestFiltering>
</security>
</system.webServer>
</configuration>
</configuration>