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

Add master back as 5, mark 4.0 as stable

This commit is contained in:
Damian Mooyman 2017-11-08 16:21:11 +13:00
parent 554070a617
commit 8901421e4f
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 148 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/_config/docs-repositories.yml
View File

@ -6,6 +6,10 @@ After:
---
RefreshMarkdownTask:
documentation_repositories:
-
- silverstripe/silverstripe-framework
- framework
- "master"
-
- silverstripe/silverstripe-framework
- framework

8
app/_config/docsviewer.yml
View File

@ -9,12 +9,20 @@ DocumentationSearch:
DocumentationManifest:
automatic_registration: false
register_entities:
-
Path: "assets/src/framework_master/docs/"
Title: "Framework"
VersionTitle: "5.x"
Version: "5"
Branch: "master"
DefaultEntity: true
-
Path: "assets/src/framework_4/docs/"
Title: "Framework"
VersionTitle: "4.x"
Version: "4"
Branch: "4"
Stable: true
DefaultEntity: true
-
Path: "assets/src/framework_3/docs/"

196
composer.lock generated
View File

@ -71,16 +71,16 @@
},
{
"name": "composer/installers",
"version": "v1.2.0",
"version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
"reference": "d78064c68299743e0161004f2de3a0204e33b804"
"reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804",
"reference": "d78064c68299743e0161004f2de3a0204e33b804",
"url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"shasum": ""
},
"require": {
@ -122,12 +122,17 @@
"keywords": [
"Craft",
"Dolibarr",
"Eliasis",
"Hurad",
"ImageCMS",
"Kanboard",
"Lan Management System",
"MODX Evo",
"Mautic",
"Maya",
"OXID",
"Plentymarkets",
"Porto",
"RadPHP",
"SMF",
"Thelia",
@ -145,20 +150,24 @@
"croogo",
"dokuwiki",
"drupal",
"eZ Platform",
"elgg",
"expressionengine",
"fuelphp",
"grav",
"installer",
"itop",
"joomla",
"kohana",
"laravel",
"lavalite",
"lithium",
"magento",
"mako",
"mediawiki",
"modulework",
"moodle",
"osclass",
"phpbb",
"piwik",
"ppi",
@ -167,6 +176,7 @@
"roundcube",
"shopware",
"silverstripe",
"sydes",
"symfony",
"typo3",
"wordpress",
@ -174,37 +184,41 @@
"zend",
"zikula"
],
"time": "2016-08-13T20:53:52+00:00"
"time": "2017-08-09T07:53:48+00:00"
},
{
"name": "doctrine/cache",
"version": "v1.6.1",
"version": "v1.7.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3"
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3",
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"shasum": ""
},
"require": {
"php": "~5.5|~7.0"
"php": "~7.1"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
"alcaeus/mongo-php-adapter": "^1.1",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^5.7",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6.x-dev"
"dev-master": "1.7.x-dev"
}
},
"autoload": {
@ -244,7 +258,7 @@
"cache",
"caching"
],
"time": "2016-10-29T11:16:17+00:00"
"time": "2017-08-25T07:02:50+00:00"
},
{
"name": "erusev/parsedown",
@ -516,21 +530,22 @@
},
{
"name": "mnapoli/front-yaml",
"version": "1.5.2",
"version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/mnapoli/FrontYAML.git",
"reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543"
"reference": "24070ace8b741247bb3161cbb38ecc541268b296"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/f10c1dfee1604d15c2b0ab6826eecc1111d65543",
"reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543",
"url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/24070ace8b741247bb3161cbb38ecc541268b296",
"reference": "24070ace8b741247bb3161cbb38ecc541268b296",
"shasum": ""
},
"require": {
"erusev/parsedown": "~1.0",
"symfony/yaml": "~2.1|^3.0"
"php": ">=5.4.0",
"symfony/yaml": "~2.1|^3.0|^4.0"
},
"require-dev": {
"league/commonmark": "~0.7",
@ -546,20 +561,20 @@
"license": [
"MIT"
],
"time": "2016-10-01T11:06:51+00:00"
"time": "2017-10-29T19:29:55+00:00"
},
{
"name": "mtdowling/cron-expression",
"version": "v1.1.0",
"version": "v1.2.1",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/cron-expression.git",
"reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5"
"reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
"reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
"reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": ""
},
"require": {
@ -570,8 +585,8 @@
},
"type": "library",
"autoload": {
"psr-0": {
"Cron": "src/"
"psr-4": {
"Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -590,20 +605,70 @@
"cron",
"schedule"
],
"time": "2016-01-26T21:23:30+00:00"
"time": "2017-01-23T04:29:33+00:00"
},
{
"name": "silverstripe/crontask",
"version": "1.1.1",
"name": "mustangostang/spyc",
"version": "0.6.2",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-crontask.git",
"reference": "ef1992904075604b76a40cc286c0f448064ddc20"
"url": "https://github.com/mustangostang/spyc.git",
"reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/ef1992904075604b76a40cc286c0f448064ddc20",
"reference": "ef1992904075604b76a40cc286c0f448064ddc20",
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
"reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
"shasum": ""
},
"require": {
"php": ">=5.3.1"
},
"require-dev": {
"phpunit/phpunit": "4.3.*@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.5.x-dev"
}
},
"autoload": {
"files": [
"Spyc.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "mustangostang",
"email": "vlad.andersen@gmail.com"
}
],
"description": "A simple YAML loader/dumper class for PHP",
"homepage": "https://github.com/mustangostang/spyc/",
"keywords": [
"spyc",
"yaml",
"yml"
],
"time": "2017-02-24T16:06:33+00:00"
},
{
"name": "silverstripe/crontask",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-crontask.git",
"reference": "dda7a14ae44966b738df304af0050ddf6af4b7ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/dda7a14ae44966b738df304af0050ddf6af4b7ed",
"reference": "dda7a14ae44966b738df304af0050ddf6af4b7ed",
"shasum": ""
},
"require": {
@ -614,6 +679,11 @@
"phpunit/phpunit": "~3.7@stable"
},
"type": "silverstripe-module",
"extra": {
"branch-alias": {
"1": "1.2.x-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
@ -633,7 +703,7 @@
"cron",
"silverstripe"
],
"time": "2016-09-13T10:39:18+00:00"
"time": "2017-04-10T21:44:50+00:00"
},
{
"name": "silverstripe/docsviewer",
@ -720,21 +790,22 @@
},
{
"name": "silverstripe/framework",
"version": "3.5.0",
"version": "3.6.2",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "179996b5f9ccbaab8882cafbf16c389623521b72"
"reference": "3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/179996b5f9ccbaab8882cafbf16c389623521b72",
"reference": "179996b5f9ccbaab8882cafbf16c389623521b72",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e",
"reference": "3f5ddc7d003920a3f4bd65a33ce1150fbe4ee60e",
"shasum": ""
},
"require": {
"composer/installers": "~1.0",
"php": ">=5.3.3,<7"
"mustangostang/spyc": "^0.6.2",
"php": ">= 5.3.3, <7.2"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
@ -742,7 +813,7 @@
"type": "silverstripe-module",
"extra": {
"branch-alias": {
"3.x-dev": "3.5.x-dev"
"3.x-dev": "3.6.x-dev"
}
},
"autoload": {
@ -770,7 +841,7 @@
"framework",
"silverstripe"
],
"time": "2016-11-28T12:35:19+00:00"
"time": "2017-09-28T16:05:53+00:00"
},
{
"name": "silverstripe/raygun",
@ -856,16 +927,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.14",
"version": "v2.8.28",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
"reference": "7fe089232554357efb8d4af65ce209fc6e5a2186"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fe089232554357efb8d4af65ce209fc6e5a2186",
"reference": "7fe089232554357efb8d4af65ce209fc6e5a2186",
"shasum": ""
},
"require": {
@ -873,7 +944,7 @@
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/config": "^2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
@ -912,20 +983,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-10-13T01:43:15+00:00"
"time": "2017-10-01T21:00:16+00:00"
},
{
"name": "symfony/yaml",
"version": "v2.8.14",
"version": "v2.8.28",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
"reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"url": "https://api.github.com/repos/symfony/yaml/zipball/842fb6df22180244b4c65935ce1a88d324e5ff9e",
"reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e",
"shasum": ""
},
"require": {
@ -961,7 +1032,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-11-14T16:15:57+00:00"
"time": "2017-10-05T14:38:30+00:00"
},
{
"name": "unclecheese/display-logic",
@ -1160,25 +1231,30 @@
},
{
"name": "phpunit/php-timer",
"version": "1.0.8",
"version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4|~5"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"classmap": [
"src/"
@ -1200,7 +1276,7 @@
"keywords": [
"timer"
],
"time": "2016-05-12T18:03:57+00:00"
"time": "2017-02-26T11:10:40+00:00"
},
{
"name": "phpunit/php-token-stream",