tonyair/doc.silverstripe.org
1
0
Fork 0
mirror of https://github.com/silverstripe/doc.silverstripe.org synced 2024-06-29 07:59:40 +02:00
Code Issues Projects Releases Wiki Activity

update toolbar to newest version

Browse Source
This commit is contained in:
Uncle Cheese 2015-01-22 10:40:08 +13:00
parent 1bc533c5c1
commit fc3cf03882
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -7,15 +7,17 @@
"silverstripe/docsviewer": "dev-master", "silverstripe/docsviewer": "dev-master",
"silverstripe/framework": "3.1.*@stable", "silverstripe/framework": "3.1.*@stable",
"erusev/parsedown-extra": "0.2.2", "erusev/parsedown-extra": "0.2.2",
"silverstripe/toolbar": "*" "silverstripe/toolbar": "dev-master"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7@stable" "phpunit/PHPUnit": "~3.7@stable"
}, },
"repositories": [{ "repositories": [
{
"type": "vcs", "type": "vcs",
"url": "git@github.com:silverstripe/silverstripe-globaltoolbar.git" "url": "git://github.com/silverstripe/silverstripe-globaltoolbar.git"
}], }
],
"config": { "config": {
"process-timeout": 600 "process-timeout": 600
}, },

23
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "ac9102640666e8e76ce03316c08f30c2", "hash": "0ff105a4a2c93f62269ee678a168d8a9",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -277,16 +277,16 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530" "reference": "ebb6ac79792534577d975ee335782593c11e2d12"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/cd20eabf1537b99d52c7655ef2e7b7aa0d9af530", "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/ebb6ac79792534577d975ee335782593c11e2d12",
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530", "reference": "ebb6ac79792534577d975ee335782593c11e2d12",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"unclecheese/display-logic": "1.0.*" "unclecheese/display-logic": "1.1.*"
}, },
"type": "silverstripe-module", "type": "silverstripe-module",
"license": [ "license": [
@ -313,20 +313,20 @@
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master", "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master",
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
}, },
"time": "2015-01-03 17:43:43" "time": "2015-01-14 01:48:59"
}, },
{ {
"name": "unclecheese/display-logic", "name": "unclecheese/display-logic",
"version": "1.0.8", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/unclecheese/silverstripe-display-logic.git", "url": "https://github.com/unclecheese/silverstripe-display-logic.git",
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182" "reference": "ddbaa4d74901eca83a91ab5c091d78b9167ec3d9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/df95d85a0886009ce5ccae2993bbb1d0d04bc182", "url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/ddbaa4d74901eca83a91ab5c091d78b9167ec3d9",
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182", "reference": "ddbaa4d74901eca83a91ab5c091d78b9167ec3d9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -357,7 +357,7 @@
"logic", "logic",
"silverstripe" "silverstripe"
], ],
"time": "2014-12-07 23:30:55" "time": "2014-12-23 08:50:28"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -788,6 +788,7 @@
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 20, "silverstripe/docsviewer": 20,
"silverstripe/framework": 0, "silverstripe/framework": 0,
"silverstripe/toolbar": 20,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": false, "prefer-stable": false,