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

Merge pull request #48 from silverstripe/hotfix/update-toolbar 

update toolbar to newest version
This commit is contained in:
unclecheese 2015-01-22 15:51:50 +13:00
parent c6d70b94e1 fc3cf03882
commit 690e854dd1
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -7,15 +7,17 @@
"silverstripe/docsviewer": "dev-master",
"silverstripe/framework": "3.1.*@stable",
"erusev/parsedown-extra": "0.2.2",
"silverstripe/toolbar": "*"
"silverstripe/toolbar": "dev-master"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
},
"repositories": [{
"type": "vcs",
"url": "git@github.com:silverstripe/silverstripe-globaltoolbar.git"
}],
"repositories": [
{
"type": "vcs",
"url": "git://github.com/silverstripe/silverstripe-globaltoolbar.git"
}
],
"config": {
"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",
"This file is @generated automatically"
],
"hash": "ac9102640666e8e76ce03316c08f30c2",
"hash": "0ff105a4a2c93f62269ee678a168d8a9",
"packages": [
{
"name": "composer/installers",
@ -277,16 +277,16 @@
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530"
"reference": "ebb6ac79792534577d975ee335782593c11e2d12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/cd20eabf1537b99d52c7655ef2e7b7aa0d9af530",
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530",
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/ebb6ac79792534577d975ee335782593c11e2d12",
"reference": "ebb6ac79792534577d975ee335782593c11e2d12",
"shasum": ""
},
"require": {
"unclecheese/display-logic": "1.0.*"
"unclecheese/display-logic": "1.1.*"
},
"type": "silverstripe-module",
"license": [
@ -313,20 +313,20 @@
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master",
"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",
"version": "1.0.8",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/unclecheese/silverstripe-display-logic.git",
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182"
"reference": "ddbaa4d74901eca83a91ab5c091d78b9167ec3d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/df95d85a0886009ce5ccae2993bbb1d0d04bc182",
"reference": "df95d85a0886009ce5ccae2993bbb1d0d04bc182",
"url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/ddbaa4d74901eca83a91ab5c091d78b9167ec3d9",
"reference": "ddbaa4d74901eca83a91ab5c091d78b9167ec3d9",
"shasum": ""
},
"require": {
@ -357,7 +357,7 @@
"logic",
"silverstripe"
],
"time": "2014-12-07 23:30:55"
"time": "2014-12-23 08:50:28"
}
],
"packages-dev": [
@ -788,6 +788,7 @@
"stability-flags": {
"silverstripe/docsviewer": 20,
"silverstripe/framework": 0,
"silverstripe/toolbar": 20,
"phpunit/phpunit": 0
},
"prefer-stable": false,