mirror of
https://github.com/silverstripe/doc.silverstripe.org
synced 2024-06-15 09:11:40 +02:00
Merge pull request #154 from robbieaverill/bugfix/versioned-index-page
Update docsviewer to include versioned "documentation index" page
This commit is contained in:
commit
39286d3caf
|
@ -51,6 +51,9 @@ ErrorDocument 500 /assets/error-500.html
|
||||||
# Redirect any version > 3.4 to 3 branch
|
# Redirect any version > 3.4 to 3 branch
|
||||||
RewriteRule ^en/3\.[5-9]/(.*)?$ /en/3/$1 [R=301,L]
|
RewriteRule ^en/3\.[5-9]/(.*)?$ /en/3/$1 [R=301,L]
|
||||||
|
|
||||||
|
# Redirect old index links to the current version
|
||||||
|
RewriteRule ^en/all\/?$ /en/3/all [R=301,L]
|
||||||
|
|
||||||
# DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id=<pagename>
|
# DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id=<pagename>
|
||||||
# to /pagename, which can then be matched by the legacy rewrite rules further down
|
# to /pagename, which can then be matched by the legacy rewrite rules further down
|
||||||
RewriteCond %{QUERY_STRING} ^(\bid\b=([^&]*)&?(.*)?)
|
RewriteCond %{QUERY_STRING} ^(\bid\b=([^&]*)&?(.*)?)
|
||||||
|
|
|
@ -10,4 +10,4 @@ Director:
|
||||||
'dev/buildcache/$Action': 'RebuildStaticCacheTask'
|
'dev/buildcache/$Action': 'RebuildStaticCacheTask'
|
||||||
'dev': 'DevelopmentAdmin'
|
'dev': 'DevelopmentAdmin'
|
||||||
'': '->en/'
|
'': '->en/'
|
||||||
'$Lang/$Action': 'DocumentationViewer'
|
'$Lang/$Version/$Action': 'DocumentationViewer'
|
||||||
|
|
10
composer.lock
generated
10
composer.lock
generated
|
@ -554,16 +554,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/docsviewer",
|
"name": "silverstripe/docsviewer",
|
||||||
"version": "2.0.0-beta4",
|
"version": "2.0.0-beta5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
|
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
|
||||||
"reference": "40d70a0b32f1ea63594238ab25aba9d9397416b7"
|
"reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/40d70a0b32f1ea63594238ab25aba9d9397416b7",
|
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/ded5432ec0d6e2183c395ef4a98e7695c89d5112",
|
||||||
"reference": "40d70a0b32f1ea63594238ab25aba9d9397416b7",
|
"reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -591,7 +591,7 @@
|
||||||
"documentation",
|
"documentation",
|
||||||
"silverstripe"
|
"silverstripe"
|
||||||
],
|
],
|
||||||
"time": "2016-12-04 21:22:45"
|
"time": "2016-12-12 00:54:31"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/dynamodb",
|
"name": "silverstripe/dynamodb",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user