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

Remove toolbar fork, lock toolbar to ~4.2.3

This commit is contained in:
Robbie Averill 2019-08-13 11:39:08 +12:00
parent 475a7db6be
commit 81b0401154
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -6,7 +6,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0", "silverstripe/docsviewer": "^2.0",
"silverstripe/framework": "~3.6", "silverstripe/framework": "~3.6",
"silverstripe/toolbar": "dev-feature/55276-swiftype-search", "silverstripe/toolbar": "~4.2.3",
"silverstripe/dynamodb": "^3", "silverstripe/dynamodb": "^3",
"mandrew/silverstripe-quickfeedback": "^0.2", "mandrew/silverstripe-quickfeedback": "^0.2",
"silverstripe/raygun": "^1.1" "silverstripe/raygun": "^1.1"
@ -17,7 +17,7 @@
"repositories": [ "repositories": [
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/lexakami/silverstripe-globaltoolbar" "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git"
} }
], ],
"config": { "config": {

18
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "66e3760a1d7af03c0407bd5abb301dd3", "content-hash": "584b20c5ae4aa35473bb51416f1500a2",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -1184,16 +1184,16 @@
}, },
{ {
"name": "silverstripe/toolbar", "name": "silverstripe/toolbar",
"version": "dev-feature/55276-swiftype-search", "version": "4.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/lexakami/silverstripe-globaltoolbar.git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
"reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7" "reference": "999a1c2587f13b5953498f6453d74c8469c24b64"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/lexakami/silverstripe-globaltoolbar/zipball/f669e9148d40d3dd32f52bd3ce74148074bec6c7", "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/999a1c2587f13b5953498f6453d74c8469c24b64",
"reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7", "reference": "999a1c2587f13b5953498f6453d74c8469c24b64",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1221,9 +1221,10 @@
"silverstripe" "silverstripe"
], ],
"support": { "support": {
"source": "https://github.com/lexakami/silverstripe-globaltoolbar/tree/feature/55276-swiftype-search" "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2.3",
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
}, },
"time": "2019-08-08T04:59:31+00:00" "time": "2019-08-12T23:19:56+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -1754,7 +1755,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"silverstripe/toolbar": 20,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": true, "prefer-stable": true,