From 72997065f032b223a6746eaf7e96d5718f39fa2c Mon Sep 17 00:00:00 2001 From: Colin O'Dell Date: Sat, 19 Sep 2015 10:49:55 -0400 Subject: [PATCH 1/2] Loosen league/commonmark version See https://github.com/thephpleague/commonmark#versioning --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c5ef9c962b..58e3d29a20 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "watson/validating": "~1.0", "doctrine/dbal": "~2.5", "illuminate/html": "~5.0", - "league/commonmark": "0.7.*", + "league/commonmark": "~0.7", "rcrowe/twigbridge": "0.7.x@dev", "zizaco/entrust": "dev-laravel-5", "league/csv": "^7.1" From da3dc599f9b8d2e9d1d7c5b5dfda560d0569aa4c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 27 Dec 2015 09:35:24 +0100 Subject: [PATCH 2/2] Fix chart call. --- app/Http/Controllers/Chart/AccountController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index e1961e6c06..c1df3470f3 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -60,7 +60,7 @@ class AccountController extends Controller } // make chart: - $data = $this->generator->all($accounts, $start, $end); + $data = $this->generator->frontpage($accounts, $start, $end); $cache->store($data); return Response::json($data);