From e29c82f0276c2919fe28a9283bc3e126bf139d0e Mon Sep 17 00:00:00 2001 From: Sebastian Ferrari Date: Wed, 3 Jun 2015 05:13:06 -0300 Subject: [PATCH 1/3] Update version of Panopoly and Drupal core. --- SKELETON.make | 22 +++++++++++----------- tools/build.make.tpl | 5 ++++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/SKELETON.make b/SKELETON.make index 8280104..ecf15d3 100644 --- a/SKELETON.make +++ b/SKELETON.make @@ -13,41 +13,41 @@ projects[kw_itemnames][subdir] = "kraftwagen" ; The Panopoly Foundation -projects[panopoly_core][version] = 1.11 +projects[panopoly_core][version] = 1.21 projects[panopoly_core][subdir] = panopoly -projects[panopoly_images][version] = 1.11 +projects[panopoly_images][version] = 1.21 projects[panopoly_images][subdir] = panopoly -projects[panopoly_theme][version] = 1.11 +projects[panopoly_theme][version] = 1.21 projects[panopoly_theme][subdir] = panopoly -projects[panopoly_magic][version] = 1.11 +projects[panopoly_magic][version] = 1.21 projects[panopoly_magic][subdir] = panopoly -projects[panopoly_widgets][version] = 1.11 +projects[panopoly_widgets][version] = 1.21 projects[panopoly_widgets][subdir] = panopoly -projects[panopoly_admin][version] = 1.11 +projects[panopoly_admin][version] = 1.21 projects[panopoly_admin][subdir] = panopoly -projects[panopoly_users][version] = 1.11 +projects[panopoly_users][version] = 1.21 projects[panopoly_users][subdir] = panopoly ; The Panopoly Toolset -projects[panopoly_pages][version] = 1.11 +projects[panopoly_pages][version] = 1.21 projects[panopoly_pages][subdir] = panopoly -projects[panopoly_wysiwyg][version] = 1.11 +projects[panopoly_wysiwyg][version] = 1.21 projects[panopoly_wysiwyg][subdir] = panopoly -projects[panopoly_search][version] = 1.11 +projects[panopoly_search][version] = 1.21 projects[panopoly_search][subdir] = panopoly ; For running the automated tests. -projects[panopoly_test][version] = 1.11 +projects[panopoly_test][version] = 1.21 projects[panopoly_test][subdir] = panopoly ; The Panopoly Radix diff --git a/tools/build.make.tpl b/tools/build.make.tpl index 23fe8d7..5adf4dc 100644 --- a/tools/build.make.tpl +++ b/tools/build.make.tpl @@ -1,8 +1,11 @@ core = 7.x api = 2 -projects[drupal][version] = "7.31" +projects[drupal][version] = "7.36" projects[***MACHINE_NAME***][type] = "profile" projects[***MACHINE_NAME***][download][type] = "kraftwagen_directory" projects[***MACHINE_NAME***][download][url] = "**SRC_DIR**" + +; Bug with image styles on database update +projects[drupal][patch][1973278] = http://www.drupal.org/files/issues/image-accommodate_missing_definition-1973278-16.patch From d549e2a02c9114b6109dad54c8e2d112f8ae4b19 Mon Sep 17 00:00:00 2001 From: Sebastian Ferrari Date: Wed, 3 Jun 2015 06:18:57 -0300 Subject: [PATCH 2/3] also updating the Radix. --- SKELETON.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SKELETON.make b/SKELETON.make index ecf15d3..0bcada8 100644 --- a/SKELETON.make +++ b/SKELETON.make @@ -51,8 +51,8 @@ projects[panopoly_test][version] = 1.21 projects[panopoly_test][subdir] = panopoly ; The Panopoly Radix -projects[radix][version] = 3.0-beta1 -projects[radix_layouts][version] = 3.0-alpha2 +projects[radix][version] = 3.0-rc2 +projects[radix_layouts][version] = 3.3 projects[radix_layouts][subdir] = radix ;projects[radix_admin][version] = 3.x-dev ;projects[radix_admin][subdir] = radix From 5d62f8cc86a911d7297608de7e8dcc1ee524b59e Mon Sep 17 00:00:00 2001 From: Lucas Constantino Silva Date: Mon, 21 Sep 2015 15:42:06 -0300 Subject: [PATCH 3/3] Replaced radix with tallerini base theme. --- SKELETON.make | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/SKELETON.make b/SKELETON.make index 0bcada8..268b1e6 100644 --- a/SKELETON.make +++ b/SKELETON.make @@ -51,12 +51,17 @@ projects[panopoly_test][version] = 1.21 projects[panopoly_test][subdir] = panopoly ; The Panopoly Radix -projects[radix][version] = 3.0-rc2 -projects[radix_layouts][version] = 3.3 -projects[radix_layouts][subdir] = radix +;projects[radix_layouts][version] = 3.3 +;projects[radix_layouts][subdir] = radix ;projects[radix_admin][version] = 3.x-dev ;projects[radix_admin][subdir] = radix ;projects[radix_views][version] = 3.x-dev ;projects[radix_views][subdir] = radix ;projects[radix_colorizer][version] = 1.x-dev ;projects[radix_colorizer][subdir] = radix + +; Tallerini base theme +projects[tallerini][type] = "theme" +projects[tallerini][download][type] = "git" +projects[tallerini][download][url] = "git://github.com/TallerWebSolutions/tallerini.git" +projects[tallerini][subdir] = "kraftwagen"