From 02c17fa2b99a7e8e7a9229732d7a9b3d1302efb4 Mon Sep 17 00:00:00 2001 From: Jake Ovenden Date: Wed, 7 Oct 2015 15:13:27 +1300 Subject: [PATCH 1/3] removed gridfield from dependencies to stop clash in versions for cwp clients using cwp basic recipe > 1.1.1 --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ad9f691..840b78c 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,7 @@ }], "require": { "silverstripe/framework": "~3.1", - "silverstripe/cms": "~3.1", - "silverstripe-australia/gridfieldextensions": "~1.0.0" + "silverstripe/cms": "~3.1" }, "minimum-stability": "dev" } From f8ed92446a70b1bc31a12fc42af568920344f7cf Mon Sep 17 00:00:00 2001 From: Jake Ovenden Date: Wed, 7 Oct 2015 16:20:47 +1300 Subject: [PATCH 2/3] include newer version of gridfield --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 840b78c..47496e8 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,8 @@ }], "require": { "silverstripe/framework": "~3.1", - "silverstripe/cms": "~3.1" + "silverstripe/cms": "~3.1", + "silverstripe-australia/gridfieldextensions": "1.1.0" }, "minimum-stability": "dev" } From b7258bbc668a609450b3903bab0a03d957dc0b36 Mon Sep 17 00:00:00 2001 From: Jake Ovenden Date: Wed, 7 Oct 2015 16:34:01 +1300 Subject: [PATCH 3/3] suggested syntax fix --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 47496e8..9a5617e 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "silverstripe/framework": "~3.1", "silverstripe/cms": "~3.1", - "silverstripe-australia/gridfieldextensions": "1.1.0" + "silverstripe-australia/gridfieldextensions": "^1.1.0" }, "minimum-stability": "dev" }