From 93daffe4d16af39e1a0bce4069be7b6526ffae59 Mon Sep 17 00:00:00 2001
From: Cam Findlay <cam@silverstripe.com>
Date: Mon, 4 Jul 2016 13:23:57 +1200
Subject: [PATCH] Set 3.4 stable

---
 app/_config/docsviewer.yml       |  1 -
 app/code/RefreshMarkdownTask.php |  6 ++++-
 composer.json                    |  2 +-
 composer.lock                    | 40 ++++++++++++++++++--------------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/_config/docsviewer.yml b/app/_config/docsviewer.yml
index c3db64c..21e6197 100644
--- 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
index 18232ff..1deab14 100644
--- a/app/code/RefreshMarkdownTask.php
+++ b/app/code/RefreshMarkdownTask.php
@@ -111,8 +111,12 @@ class RefreshMarkdownTask extends BuildTask
     {
         $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
index 234f3fb..b21afca 100644
--- 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
index f26ea9f..f0920bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7aca7c53bf2e2a013790143ca4493ffb",
-    "content-hash": "99728b10c87af2ab40e8f0da741ef8c0",
+    "hash": "cc3e0d21493519332387f87c4e668fb5",
+    "content-hash": "93abce3419beb70f39d06267aa1d5e84",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -416,6 +416,7 @@
                 "rest",
                 "web service"
             ],
+            "abandoned": "guzzlehttp/guzzle",
             "time": "2015-03-18 18:23:50"
         },
         {
@@ -633,16 +634,16 @@
         },
         {
             "name": "silverstripe/framework",
-            "version": "3.2.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-framework.git",
-                "reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5"
+                "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/0178fa5a1873a0f1d6100268c86dab81a18c23a5",
-                "reference": "0178fa5a1873a0f1d6100268c86dab81a18c23a5",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/8008fcbe9769f1d2cb53c542f302ad6d32d185d6",
+                "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6",
                 "shasum": ""
             },
             "require": {
@@ -653,6 +654,11 @@
                 "phpunit/phpunit": "~3.7"
             },
             "type": "silverstripe-module",
+            "extra": {
+                "branch-alias": {
+                    "3.x-dev": "3.4.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "tests/behat/features/bootstrap"
@@ -678,7 +684,7 @@
                 "framework",
                 "silverstripe"
             ],
-            "time": "2015-11-16 03:17:10"
+            "time": "2016-06-02 22:59:29"
         },
         {
             "name": "silverstripe/toolbar",
@@ -726,16 +732,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.7",
+            "version": "v2.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "2a6b8713f8bdb582058cfda463527f195b066110"
+                "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110",
-                "reference": "2a6b8713f8bdb582058cfda463527f195b066110",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
+                "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9",
                 "shasum": ""
             },
             "require": {
@@ -782,7 +788,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2016-06-29 05:29:29"
         },
         {
             "name": "unclecheese/display-logic",
@@ -1197,16 +1203,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.7",
+            "version": "v2.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34"
+                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34",
-                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
+                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
                 "shasum": ""
             },
             "require": {
@@ -1242,7 +1248,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2016-06-29 05:29:29"
         }
     ],
     "aliases": [],