From: Dan Brown <redacted>
Date: Wed, 1 Feb 2017 22:28:38 +0000 (+0000)
Subject: Merge branch 'v0.14'
X-Git-Tag: v0.15.0~1^2~18
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2431ce9f86cdbba5bbd7b179e3ab4cd66b6a1b77?ds=inline;hp=-c

Merge branch 'v0.14'
---

2431ce9f86cdbba5bbd7b179e3ab4cd66b6a1b77
diff --combined composer.json
index c0543a4ca,8d963022c..f0cf9c4ae
--- a/composer.json
+++ b/composer.json
@@@ -6,18 -6,17 +6,18 @@@
      "type": "project",
      "require": {
          "php": ">=5.6.4",
 -        "laravel/framework": "^5.3.4",
 +        "laravel/framework": "5.4.*",
          "ext-tidy": "*",
          "intervention/image": "^2.3",
 -        "laravel/socialite": "^2.0",
 -        "barryvdh/laravel-ide-helper": "^2.1",
 -        "barryvdh/laravel-debugbar": "^2.2.3",
 +        "laravel/socialite": "^3.0",
 +        "barryvdh/laravel-ide-helper": "^2.2.3",
 +        "barryvdh/laravel-debugbar": "^2.3.2",
          "league/flysystem-aws-s3-v3": "^1.0",
          "barryvdh/laravel-dompdf": "^0.7",
          "predis/predis": "^1.1",
          "gathercontent/htmldiff": "^0.2.1",
 -        "barryvdh/laravel-snappy": "^0.3.1"
 +        "barryvdh/laravel-snappy": "^0.3.1",
 +        "laravel/browser-kit-testing": "^1.0"
      },
      "require-dev": {
          "fzaninotto/faker": "~1.4",
@@@ -36,8 -35,7 +36,8 @@@
      },
      "autoload-dev": {
          "classmap": [
 -            "tests/TestCase.php"
 +            "tests/TestCase.php",
 +            "tests/BrowserKitTest.php"
          ]
      },
      "scripts": {
@@@ -49,7 -47,9 +49,9 @@@
          ],
          "post-install-cmd": [
              "Illuminate\\Foundation\\ComposerScripts::postInstall",
-             "php artisan optimize"
+             "php artisan optimize",
+             "php artisan cache:clear",
+             "php artisan view:clear"
          ],
          "post-update-cmd": [
              "Illuminate\\Foundation\\ComposerScripts::postUpdate",