From c4e06a4b07831d451a8081fe1b611c1e6d31cf65 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 22 Feb 2018 18:14:32 +1300 Subject: [PATCH 1/4] Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 51a18e5..b72853d 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "silverstripe/cms": "^4.0", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "^2.0", + "silverstripe/tagfield": "2.0.0@stable", "silverstripe/assets": "^1.0@dev", "silverstripe/asset-admin": "^1.0@dev" }, @@ -53,4 +53,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From 06bcd961ce937cddf697ee29f791bac2629aae6b Mon Sep 17 00:00:00 2001 From: Joris Debonnet Date: Tue, 10 Apr 2018 02:04:44 +0200 Subject: [PATCH 2/4] Bring back BlogPost URLSegment to Main tab --- src/Model/BlogPost.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php index 0b17b0c..b568937 100644 --- a/src/Model/BlogPost.php +++ b/src/Model/BlogPost.php @@ -245,14 +245,6 @@ class BlogPost extends Page $fields->insertAfter($summaryHolder, 'FeaturedImage'); - $urlSegment = $fields->dataFieldByName('URLSegment'); - $urlSegment->setURLPrefix($this->Parent()->RelativeLink()); - - $fields->removeFieldsFromTab('Root.Main', [ - 'MenuTitle', - 'URLSegment', - ]); - $authorField = ListboxField::create( 'Authors', _t(__CLASS__ . '.Authors', 'Authors'), @@ -303,7 +295,6 @@ class BlogPost extends Page 'Root.PostOptions', [ $publishDate, - $urlSegment, TagField::create( 'Categories', _t(__CLASS__ . '.Categories', 'Categories'), From 50612b4f4c368f503993f6276d0aa3a53a369a65 Mon Sep 17 00:00:00 2001 From: Dylan Wagstaff Date: Tue, 10 Apr 2018 14:42:51 +1200 Subject: [PATCH 3/4] Remove obsolete branch alias --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b72853d..77afbb2 100755 --- a/composer.json +++ b/composer.json @@ -19,9 +19,6 @@ "squizlabs/php_codesniffer": "*" }, "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - }, "expose": [ "client/dist", "client/images" @@ -53,4 +50,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From ae953b9a3c8fcb74133dadeb57ad67ed84f6701c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 10 Apr 2018 15:49:44 +1200 Subject: [PATCH 4/4] Update constraints for dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 77afbb2..ff36aa5 100755 --- a/composer.json +++ b/composer.json @@ -10,13 +10,13 @@ "require": { "silverstripe/cms": "^4.0", "silverstripe/lumberjack": "^2.0", - "silverstripe/tagfield": "2.0.0@stable", - "silverstripe/assets": "^1.0@dev", - "silverstripe/asset-admin": "^1.0@dev" + "silverstripe/tagfield": "^2.0", + "silverstripe/assets": "^1.0", + "silverstripe/asset-admin": "^1.0" }, "require-dev": { - "phpunit/PHPUnit": "^5.7", - "squizlabs/php_codesniffer": "*" + "phpunit/phpunit": "^5.7", + "squizlabs/php_codesniffer": "^3.0" }, "extra": { "expose": [