Merge branch '3.1'

This commit is contained in:
Simon Welsh 2013-07-01 13:01:14 +12:00
commit 8b76cb8fb9
2 changed files with 1 additions and 227 deletions

View File

@ -12,7 +12,7 @@
# This denies access to all yml files, since developers might include sensitive # This denies access to all yml files, since developers might include sensitive
# information in them. See the docs for work-arounds to serve some yaml files # information in them. See the docs for work-arounds to serve some yaml files
<Files *.yml> <Files ~ "\.ya?ml$">
Order allow,deny Order allow,deny
Deny from all Deny from all
</Files> </Files>

226
composer.lock generated
View File

@ -1,226 +0,0 @@
{
"_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": [
]
}