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 #189 from lexakami/hotfix/55276-swiftype 

Update docsviewer to 2.x-dev to get canonical URL fix
This commit is contained in:
Robbie Averill 2019-08-15 14:15:06 +12:00 committed by GitHub
parent 6aabf25f4f bbce6eb206
commit 70f29f99bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -4,7 +4,7 @@
"require": { "require": {
"ext-gd": "*", "ext-gd": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0", "silverstripe/docsviewer": "2.x-dev",
"silverstripe/framework": "~3.6", "silverstripe/framework": "~3.6",
"silverstripe/toolbar": "~4.2.3", "silverstripe/toolbar": "~4.2.3",
"silverstripe/dynamodb": "^3", "silverstripe/dynamodb": "^3",

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": "584b20c5ae4aa35473bb51416f1500a2", "content-hash": "8544bc821d77107865374653cdd93d8c",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -969,16 +969,16 @@
}, },
{ {
"name": "silverstripe/docsviewer", "name": "silverstripe/docsviewer",
"version": "2.0.0", "version": "2.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "171652b33821d342ac1603c3bb0e0bdddc111a26" "reference": "6681ced3277d692fe916604cad5ea88f40481b18"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/171652b33821d342ac1603c3bb0e0bdddc111a26", "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/6681ced3277d692fe916604cad5ea88f40481b18",
"reference": "171652b33821d342ac1603c3bb0e0bdddc111a26", "reference": "6681ced3277d692fe916604cad5ea88f40481b18",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -991,11 +991,6 @@
"silverstripe/staticpublisher": "Allows publishing documentation as HTML" "silverstripe/staticpublisher": "Allows publishing documentation as HTML"
}, },
"type": "silverstripe-module", "type": "silverstripe-module",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
@ -1012,7 +1007,7 @@
"documentation", "documentation",
"silverstripe" "silverstripe"
], ],
"time": "2019-02-14T07:56:02+00:00" "time": "2019-08-15T00:06:38+00:00"
}, },
{ {
"name": "silverstripe/dynamodb", "name": "silverstripe/dynamodb",
@ -1755,6 +1750,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 20,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": true, "prefer-stable": true,