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

Update docsviewer to 2.0.0-rc1 to fix canonical URLs and default lang redirects

Browse Source
This commit is contained in:
Robbie Averill 2017-11-13 14:16:34 +13:00
parent 27aa2229d5
commit d8002433c9
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess
View File

@ -32,9 +32,6 @@ ErrorDocument 500 /assets/error-500.html
RewriteCond %{HTTP_HOST} ^(docs?.silverstripe.com|doc.silverstripe.org|beta.docs.silverstripe.org)$ [NC] RewriteCond %{HTTP_HOST} ^(docs?.silverstripe.com|doc.silverstripe.org|beta.docs.silverstripe.org)$ [NC]
RewriteRule ^(.*)$ https://docs.silverstripe.org/$1 [L,R=301] RewriteRule ^(.*)$ https://docs.silverstripe.org/$1 [L,R=301]
# Home page redirect
RewriteRule ^(/)?$ /en/4/ [R=302,NC,QSA,L]
# Legacy rewrite from sapphire/ to framework/ namespace # Legacy rewrite from sapphire/ to framework/ namespace
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !^framework/main\.php RewriteCond %{REQUEST_URI} !^framework/main\.php

2
composer.json
View File

@ -4,7 +4,7 @@
"require": { "require": {
"ext-gd": "*", "ext-gd": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0@beta", "silverstripe/docsviewer": "^2.0@rc",
"silverstripe/framework": "^3.2", "silverstripe/framework": "^3.2",
"silverstripe/toolbar": "^4.2", "silverstripe/toolbar": "^4.2",
"silverstripe/dynamodb": "^1.1", "silverstripe/dynamodb": "^1.1",

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"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"
], ],
"content-hash": "e6c7b612751c05e732df53cfa1d4aae0", "content-hash": "3e089a4d1755a301b0b42f28b0825fba",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -637,16 +637,16 @@
}, },
{ {
"name": "silverstripe/docsviewer", "name": "silverstripe/docsviewer",
"version": "2.0.0-beta8", "version": "2.0.0-rc1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "83594bdf7785d4fc1bb87b5357a832a7bf1fb16d" "reference": "fccde14751b81d19d4723cf92826d483a7555864"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/83594bdf7785d4fc1bb87b5357a832a7bf1fb16d", "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/fccde14751b81d19d4723cf92826d483a7555864",
"reference": "83594bdf7785d4fc1bb87b5357a832a7bf1fb16d", "reference": "fccde14751b81d19d4723cf92826d483a7555864",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -675,7 +675,7 @@
"documentation", "documentation",
"silverstripe" "silverstripe"
], ],
"time": "2017-08-30T01:57:52+00:00" "time": "2017-11-13T01:08:23+00:00"
}, },
{ {
"name": "silverstripe/dynamodb", "name": "silverstripe/dynamodb",
@ -1378,7 +1378,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 10, "silverstripe/docsviewer": 5,
"phpunit/phpunit": 0 "phpunit/phpunit": 0
}, },
"prefer-stable": true, "prefer-stable": true,