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 #1 from silverstripe/uat/3.4.0 

Set 3.4 stable, framework update.
This commit is contained in:
Damian Mooyman 2016-07-04 16:52:17 +12:00 committed by GitHub
parent 415ed022e8 93daffe4d1
commit 2fdaa20f76
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/_config/docsviewer.yml
View File

@ -27,7 +27,6 @@ DocumentationManifest:
Title: "Framework" Title: "Framework"
Version: "3.3" Version: "3.3"
Branch: "3.3" Branch: "3.3"
Stable: true
DefaultEntity: true DefaultEntity: true
- -
Path: "assets/src/framework_3.2/docs/" Path: "assets/src/framework_3.2/docs/"

6
app/code/RefreshMarkdownTask.php
View File

@ -111,8 +111,12 @@ class RefreshMarkdownTask extends BuildTask
{ {
$eol = Director::is_cli() ? PHP_EOL : "<br>"; $eol = Director::is_cli() ? PHP_EOL : "<br>";
echo $message . $eol; echo $message . $eol;
ob_flush(); if(ob_get_level() > 0) {
ob_flush();
}
flush(); flush();
} }
/** /**

2
composer.json
View File

@ -5,7 +5,7 @@
"ext-gd": "*", "ext-gd": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0", "silverstripe/docsviewer": "^2.0",
"silverstripe/framework": "3.2.1", "silverstripe/framework": "^3.2",
"silverstripe/toolbar": "^4.0", "silverstripe/toolbar": "^4.0",
"silverstripe/dynamodb": "^1.1", "silverstripe/dynamodb": "^1.1",
"mandrew/silverstripe-quickfeedback": "^0.2" "mandrew/silverstripe-quickfeedback": "^0.2"

40
composer.lock generated
View File

@ -4,8 +4,8 @@
"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"
], ],
"hash": "7aca7c53bf2e2a013790143ca4493ffb", "hash": "cc3e0d21493519332387f87c4e668fb5",
"content-hash": "99728b10c87af2ab40e8f0da741ef8c0", "content-hash": "93abce3419beb70f39d06267aa1d5e84",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -416,6 +416,7 @@
"rest", "rest",
"web service" "web service"
], ],
"abandoned": "guzzlehttp/guzzle",
"time": "2015-03-18 18:23:50" "time": "2015-03-18 18:23:50"
}, },
{ {
@ -633,16 +634,16 @@
}, },
{ {
"name": "silverstripe/framework", "name": "silverstripe/framework",
"version": "3.2.1", "version": "3.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git", "url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5" "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/0178fa5a1873a0f1d6100268c86dab81a18c23a5", "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/8008fcbe9769f1d2cb53c542f302ad6d32d185d6",
"reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5", "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -653,6 +654,11 @@
"phpunit/phpunit": "~3.7" "phpunit/phpunit": "~3.7"
}, },
"type": "silverstripe-module", "type": "silverstripe-module",
"extra": {
"branch-alias": {
"3.x-dev": "3.4.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"tests/behat/features/bootstrap" "tests/behat/features/bootstrap"
@ -678,7 +684,7 @@
"framework", "framework",
"silverstripe" "silverstripe"
], ],
"time": "2015-11-16 03:17:10" "time": "2016-06-02 22:59:29"
}, },
{ {
"name": "silverstripe/toolbar", "name": "silverstripe/toolbar",
@ -726,16 +732,16 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.8.7", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "2a6b8713f8bdb582058cfda463527f195b066110" "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
"reference": "2a6b8713f8bdb582058cfda463527f195b066110", "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -782,7 +788,7 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-06 11:11:27" "time": "2016-06-29 05:29:29"
}, },
{ {
"name": "unclecheese/display-logic", "name": "unclecheese/display-logic",
@ -1197,16 +1203,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.8.7", "version": "v2.8.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34" "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34", "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34", "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1242,7 +1248,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-06 11:11:27" "time": "2016-06-29 05:29:29"
} }
], ],
"aliases": [], "aliases": [],