Merge pull request #1 from silverstripe/uat/3.4.0

Set 3.4 stable, framework update.
silverstripe · Jul 4, 2016 · 2fdaa20 · 2fdaa20
2 parents 415ed02 + 93daffe
commit 2fdaa20
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/app/_config/docsviewer.yml b/app/_config/docsviewer.yml
@@ -27,7 +27,6 @@ DocumentationManifest:
       Title: "Framework"
       Version: "3.3"
       Branch: "3.3"
-      Stable: true
       DefaultEntity: true
     -
       Path: "assets/src/framework_3.2/docs/"

diff --git a/app/code/RefreshMarkdownTask.php b/app/code/RefreshMarkdownTask.php
@@ -111,8 +111,12 @@ private function printLine($message)
     {
         $eol = Director::is_cli() ? PHP_EOL : "<br>";
         echo $message . $eol;
-		ob_flush();
+		if(ob_get_level() > 0) {
+			ob_flush();
+		}
 		flush();
+
+
     }
 
 	/**

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
 		"ext-gd": "*",
 		"ext-mbstring": "*",
 		"silverstripe/docsviewer": "^2.0",
-		"silverstripe/framework": "3.2.1",
+		"silverstripe/framework": "^3.2",
 		"silverstripe/toolbar": "^4.0",
 		"silverstripe/dynamodb": "^1.1",
 		"mandrew/silverstripe-quickfeedback": "^0.2"

diff --git a/composer.lock b/composer.lock