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

Framework version upgrade + tidy up

Browse Source
This commit is contained in:
Cam Findlay 2015-10-14 09:35:07 +13:00
parent f4578c7303
commit 1c530909af
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -5,7 +5,7 @@
"ext-gd": "*", "ext-gd": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "dev-develop", "silverstripe/docsviewer": "dev-develop",
"silverstripe/framework": "3.2.*@stable", "silverstripe/framework": "^3.2",
"silverstripe/toolbar": "^4.0" "silverstripe/toolbar": "^4.0"
}, },
"require-dev": { "require-dev": {
@ -21,6 +21,7 @@
"process-timeout": 600 "process-timeout": 600
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true,
"scripts": { "scripts": {
} }

54
composer.lock generated
View File

@ -4,21 +4,21 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "4433c3fe37a77dd6b443beea1a7f3b98", "hash": "e9df82c706bdf4a50be03672eecc0741",
"content-hash": "6d85c8529bc3e18fe8f3d1f27f4be506", "content-hash": "5e821e68a1865d0d7d41f2389f49218d",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
"version": "dev-master", "version": "v1.0.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/installers.git", "url": "https://github.com/composer/installers.git",
"reference": "e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41" "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41", "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
"reference": "e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41", "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
"shasum": "" "shasum": ""
}, },
"replace": { "replace": {
@ -100,7 +100,7 @@
"zend", "zend",
"zikula" "zikula"
], ],
"time": "2015-06-13 15:30:38" "time": "2015-02-18 17:17:01"
}, },
{ {
"name": "erusev/parsedown", "name": "erusev/parsedown",
@ -367,7 +367,7 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "1.2.x-dev", "version": "1.2.18",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
@ -428,7 +428,7 @@
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
"version": "dev-master", "version": "1.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
@ -680,34 +680,26 @@
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "1.2.x-dev", "version": "1.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "c39c4511c3b007539eb170c32cbc2af49a07351a" "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c39c4511c3b007539eb170c32cbc2af49a07351a", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
"reference": "c39c4511c3b007539eb170c32cbc2af49a07351a", "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"phpunit/php-text-template": ">=1.1.1@stable" "phpunit/php-text-template": ">=1.1.1@stable"
}, },
"require-dev": {
"phpunit/phpunit": "3.7.*@dev"
},
"suggest": { "suggest": {
"ext-soap": "*" "ext-soap": "*"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"PHPUnit/" "PHPUnit/"
@ -733,29 +725,32 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2014-02-16 12:43:56" "time": "2013-01-13 10:24:48"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "2.8.x-dev", "version": "v2.7.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d" "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d", "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"reference": "ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d", "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.9" "php": ">=5.3.9"
}, },
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.8-dev" "dev-master": "2.7-dev"
} }
}, },
"autoload": { "autoload": {
@ -779,17 +774,16 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2015-10-12 11:16:35" "time": "2015-09-14 14:14:09"
} }
], ],
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 20, "silverstripe/docsviewer": 20,
"silverstripe/framework": 0,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": false, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"ext-gd": "*", "ext-gd": "*",

0
themes/docs/templates/Includes/DocumentationComments.ss vendored
View File

4
themes/docs/templates/Includes/DocumentationFooter.ss vendored
View File

@ -1,5 +1,7 @@
<div id="footer"> <div id="footer">
<p>Documentation powered by <a href="http://www.silverstripe.org">SilverStripe</a> (<a href="https://github.com/silverstripe/doc.silverstripe.org">code</a>). <a href="{$BaseHref}sapphire/en/misc/contributing/documentation">Contribute to doc.silverstripe.org</a>, <a href="https://github.com/silverstripe/sapphire/issues/new?labels=documentation">raise a bug or enhancement ticket</a>. Except where otherwise noted, content on this wiki is licensed under <a class="urlextern" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC Attribution-Noncommercial-Share Alike 3.0 Unported</a></p> <p>Documentation powered by <a href="http://www.silverstripe.org">SilverStripe</a> (<a href="https://github.com/silverstripe/doc.silverstripe.org">code</a>). <a href="https://github.com/silverstripe/silverstripe-framework">Contribute documentation to doc.silverstripe.org</a>, <a href="https://github.com/silverstripe/silverstripe-framework/issues/new?labels=documentation">raise a bug or enhancement ticket</a>.
Except where otherwise noted, content on this wiki is licensed under <a class="urlextern" rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC Attribution 3.0 Unported</a></p>
<p><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="//licensebuttons.net/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p> <p><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="//licensebuttons.net/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p>
</div> </div>