From bdfafc6f89bc4a01f7e333e5e99c411e1198b96a Mon Sep 17 00:00:00 2001 From: William Hearn Date: Tue, 4 Aug 2015 21:45:15 -0400 Subject: [PATCH 01/22] Start work on next release. --- drupal-org.make | 99 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 27 deletions(-) diff --git a/drupal-org.make b/drupal-org.make index c8804b8b..7fb0bc80 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -3,76 +3,121 @@ core = 7.x ; WxT Foundation (Custom) -projects[wetkit_admin][version] = 4.0-rc2 +projects[wetkit_admin][version] = 4.x-dev projects[wetkit_admin][subdir] = custom +projects[wetkit_admin][download][type] = git +projects[wetkit_admin][download][branch] = 7.x-4.x -projects[wetkit_bean][version] = 4.0-rc2 +projects[wetkit_bean][version] = 4.x-dev projects[wetkit_bean][subdir] = custom +projects[wetkit_bean][download][type] = git +projects[wetkit_bean][download][branch] = 7.x-4.x -projects[wetkit_breadcrumbs][version] = 4.1 +projects[wetkit_breadcrumbs][version] = 4.x-dev projects[wetkit_breadcrumbs][subdir] = custom +projects[wetkit_breadcrumbs][download][type] = git +projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x -projects[wetkit_core][version] = 4.0-rc3 +projects[wetkit_core][version] = 4.x-dev projects[wetkit_core][subdir] = custom +projects[wetkit_core][download][type] = git +projects[wetkit_core][download][branch] = 7.x-4.x -projects[wetkit_demo][version] = 4.1 +projects[wetkit_demo][version] = 4.x-dev projects[wetkit_demo][subdir] = custom +projects[wetkit_demo][download][type] = git +projects[wetkit_demo][download][branch] = 7.x-4.x -projects[wetkit_deployment][version] = 4.1 +projects[wetkit_deployment][version] = 4.x-dev projects[wetkit_deployment][subdir] = custom +projects[wetkit_deployment][download][type] = git +projects[wetkit_deployment][download][branch] = 7.x-4.x -projects[wetkit_images][version] = 4.1 +projects[wetkit_images][version] = 4.x-dev projects[wetkit_images][subdir] = custom +projects[wetkit_images][download][type] = git +projects[wetkit_images][download][branch] = 7.x-4.x -projects[wetkit_language][version] = 4.0-rc2 +projects[wetkit_language][version] = 4.x-dev projects[wetkit_language][subdir] = custom +projects[wetkit_language][download][type] = git +projects[wetkit_language][download][branch] = 7.x-4.x -projects[wetkit_layouts][version] = 4.0-rc2 +projects[wetkit_layouts][version] = 4.x-dev projects[wetkit_layouts][subdir] = custom +projects[wetkit_layouts][download][type] = git +projects[wetkit_layouts][download][branch] = 7.x-4.x -projects[wetkit_menu][version] = 4.0-rc2 +projects[wetkit_menu][version] = 4.x-dev projects[wetkit_menu][subdir] = custom +projects[wetkit_menu][download][type] = git +projects[wetkit_menu][download][branch] = 7.x-4.x -projects[wetkit_metatag][version] = 4.0 +projects[wetkit_metatag][version] = 4.x-dev projects[wetkit_metatag][subdir] = custom +projects[wetkit_metatag][download][type] = git +projects[wetkit_metatag][download][branch] = 7.x-4.x -projects[wetkit_migrate][version] = 4.0-rc3 +projects[wetkit_migrate][version] = 4.x-dev projects[wetkit_migrate][subdir] = custom +projects[wetkit_migrate][download][type] = git +projects[wetkit_migrate][download][branch] = 7.x-4.x -projects[wetkit_og][version] = 4.0 +projects[wetkit_og][version] = 4.x-dev projects[wetkit_og][subdir] = custom +projects[wetkit_og][download][type] = git +projects[wetkit_og][download][branch] = 7.x-4.x -projects[wetkit_pages][version] = 4.1 +projects[wetkit_pages][version] = 4.x-dev projects[wetkit_pages][subdir] = custom +projects[wetkit_pages][download][type] = git +projects[wetkit_pages][download][branch] = 7.x-4.x -projects[wetkit_search][version] = 4.0-rc2 +projects[wetkit_search][version] = 4.x-dev projects[wetkit_search][subdir] = custom +projects[wetkit_search][download][type] = git +projects[wetkit_search][download][branch] = 7.x-4.x -projects[wetkit_test][version] = 4.1 +projects[wetkit_test][version] = 4.x-dev projects[wetkit_test][subdir] = custom +projects[wetkit_test][download][type] = git +projects[wetkit_test][download][branch] = 7.x-4.x -projects[wetkit_theme][version] = 4.0-rc2 +projects[wetkit_theme][version] = 4.x-dev projects[wetkit_theme][subdir] = custom +projects[wetkit_theme][download][type] = git +projects[wetkit_theme][download][branch] = 7.x-4.x -projects[wetkit_users][version] = 4.1 +projects[wetkit_users][version] = 4.x-dev projects[wetkit_users][subdir] = custom +projects[wetkit_users][download][type] = git +projects[wetkit_users][download][branch] = 7.x-4.x -projects[wetkit_wetboew][version] = 4.0-rc2 +projects[wetkit_wetboew][version] = 4.x-dev projects[wetkit_wetboew][subdir] = custom +projects[wetkit_wetboew][download][type] = git +projects[wetkit_wetboew][download][branch] = 7.x-4.x -projects[wetkit_widgets][version] = 4.1 +projects[wetkit_widgets][version] = 4.x-dev projects[wetkit_widgets][subdir] = custom +projects[wetkit_widgets][download][type] = git +projects[wetkit_widgets][download][branch] = 7.x-4.x -projects[wetkit_wysiwyg][version] = 4.1 +projects[wetkit_wysiwyg][version] = 4.x-dev projects[wetkit_wysiwyg][subdir] = custom +projects[wetkit_wysiwyg][download][type] = git +projects[wetkit_wysiwyg][download][branch] = 7.x-4.x ; WxT Foundation (Themes) -projects[wetkit_ember][version] = 4.1 -projects[wetkit_ember][type] = theme +projects[wetkit_ember][version] = 4.x-dev +projects[wetkit_ember][download][type] = git +projects[wetkit_ember][download][branch] = 7.x-4.x -projects[wetkit_bootstrap][version] = 4.0-rc2 -projects[wetkit_bootstrap][type] = theme +projects[wetkit_bootstrap][version] = 4.x-dev +projects[wetkit_bootstrap][download][type] = git +projects[wetkit_bootstrap][download][branch] = 7.x-4.x -projects[wetkit_shiny][version] = 4.0 -projects[wetkit_shiny][type] = theme +projects[wetkit_shiny][version] = 4.x-dev +projects[wetkit_shiny][download][type] = git +projects[wetkit_shiny][download][branch] = 7.x-4.x From 8c56ad211aad51f98ccb2e3cf8f27a47ee291a30 Mon Sep 17 00:00:00 2001 From: ptsimard Date: Tue, 4 Aug 2015 21:47:17 -0400 Subject: [PATCH 02/22] Fixed WetKit Bean for Issue #2545682 by ptsimard: Better drupal_alter on wetkit_slide_collection --- drupal-org.make | 1 + 1 file changed, 1 insertion(+) diff --git a/drupal-org.make b/drupal-org.make index 7fb0bc80..49e9c7d5 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -11,6 +11,7 @@ projects[wetkit_admin][download][branch] = 7.x-4.x projects[wetkit_bean][version] = 4.x-dev projects[wetkit_bean][subdir] = custom projects[wetkit_bean][download][type] = git +projects[wetkit_bean][download][revision] = 130d41f projects[wetkit_bean][download][branch] = 7.x-4.x projects[wetkit_breadcrumbs][version] = 4.x-dev From 65d913651110a85d2fd441c9a67f92ae4ab58179 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 10:08:38 -0400 Subject: [PATCH 03/22] Fixed WetKit Bootstrap for Issue #2552591: preg_grep in _bootstrap_process_theme_registry_suggestions slow --- drupal-org.make | 1 + 1 file changed, 1 insertion(+) diff --git a/drupal-org.make b/drupal-org.make index 49e9c7d5..b6b20356 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -117,6 +117,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git +projects[wetkit_bootstrap][download][revision] = 20de757 projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From 942a08b0dfcff518da9bd49db95c7ce02d1caa15 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 10:15:44 -0400 Subject: [PATCH 04/22] Fixed WetKit Bootstrap for Issue #2552591: preg_grep in _bootstrap_process_theme_registry_suggestions slow --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index b6b20356..07df766f 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -117,7 +117,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 20de757 +projects[wetkit_bootstrap][download][revision] = 93098cf projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From 91d8029278e521464b9e4a03734ff3d7c74ccadf Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 20:30:32 -0400 Subject: [PATCH 05/22] Fixed WetKit Language for Issue #2547781: i18nviews update for plugin fix --- drupal-org.make | 1 + 1 file changed, 1 insertion(+) diff --git a/drupal-org.make b/drupal-org.make index 07df766f..4910a7e1 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -42,6 +42,7 @@ projects[wetkit_images][download][branch] = 7.x-4.x projects[wetkit_language][version] = 4.x-dev projects[wetkit_language][subdir] = custom projects[wetkit_language][download][type] = git +projects[wetkit_language][download][revision] = cce4b0c projects[wetkit_language][download][branch] = 7.x-4.x projects[wetkit_layouts][version] = 4.x-dev From 97b5b172286af6950add33f19af0a310309f8d76 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 20:45:12 -0400 Subject: [PATCH 06/22] Fix for incorrect SHA for wetkit_bootstrap. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 4910a7e1..297f0192 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -118,7 +118,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 93098cf +projects[wetkit_bootstrap][download][revision] = 4223ff2 projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From fe457a5a7850a3d32c9ef3a31d4f21189f13cf9b Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 21:09:48 -0400 Subject: [PATCH 07/22] Fixed WetKit Search for Update Search API makefile + associated features to Solr 5.21 --- drupal-org.make | 1 + 1 file changed, 1 insertion(+) diff --git a/drupal-org.make b/drupal-org.make index 297f0192..b2418523 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -78,6 +78,7 @@ projects[wetkit_pages][download][branch] = 7.x-4.x projects[wetkit_search][version] = 4.x-dev projects[wetkit_search][subdir] = custom projects[wetkit_search][download][type] = git +projects[wetkit_search][download][revision] = 04823c7 projects[wetkit_search][download][branch] = 7.x-4.x projects[wetkit_test][version] = 4.x-dev From d4d626c877a911815632cfab44665ae9f280bd81 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 21:26:13 -0400 Subject: [PATCH 08/22] Fixed WetKit Search for Remove patch breaking make build for dependencies. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index b2418523..5de767f1 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -78,7 +78,7 @@ projects[wetkit_pages][download][branch] = 7.x-4.x projects[wetkit_search][version] = 4.x-dev projects[wetkit_search][subdir] = custom projects[wetkit_search][download][type] = git -projects[wetkit_search][download][revision] = 04823c7 +projects[wetkit_search][download][revision] = 4255904 projects[wetkit_search][download][branch] = 7.x-4.x projects[wetkit_test][version] = 4.x-dev From 653578ce7581ea94f12d5018f638013a978c30bc Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Aug 2015 21:36:00 -0400 Subject: [PATCH 09/22] Fixed WetKit Core for Issue #2298877 by sylus, marco.pagliarulo: Migration doesn't take into account language of host entity --- drupal-org.make | 1 + 1 file changed, 1 insertion(+) diff --git a/drupal-org.make b/drupal-org.make index 5de767f1..07ebf87d 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -22,6 +22,7 @@ projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x projects[wetkit_core][version] = 4.x-dev projects[wetkit_core][subdir] = custom projects[wetkit_core][download][type] = git +projects[wetkit_core][download][revision] = 9ed4a79 projects[wetkit_core][download][branch] = 7.x-4.x projects[wetkit_demo][version] = 4.x-dev From 528a768bc643d1e7de6b0cc3b9817c7925315b40 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Tue, 18 Aug 2015 18:42:30 -0400 Subject: [PATCH 10/22] Fixed WetKit Bootstrap for Fix for extra padding on hamburger icon in mobile view. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 07ebf87d..da19eae7 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -120,7 +120,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 4223ff2 +projects[wetkit_bootstrap][download][revision] = 5a2bc84 projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From b432db8000709f2ef06096532a6f9dc45c7e6103 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Tue, 18 Aug 2015 21:09:48 -0400 Subject: [PATCH 11/22] Fixed WetKit Bootstrap for Fix for wetkit_bean search input fields. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index da19eae7..2b5c210e 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -120,7 +120,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 5a2bc84 +projects[wetkit_bootstrap][download][revision] = 47e0aba projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From cc16c08524b87404d7438b358c8c574c274b85ce Mon Sep 17 00:00:00 2001 From: William Hearn Date: Tue, 18 Aug 2015 21:22:43 -0400 Subject: [PATCH 12/22] Fixed WetKit Bootstrap for Fix for wetkit_bean search input fields. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 2b5c210e..7cb13e5b 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -120,7 +120,7 @@ projects[wetkit_ember][download][branch] = 7.x-4.x projects[wetkit_bootstrap][version] = 4.x-dev projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 47e0aba +projects[wetkit_bootstrap][download][revision] = 30c0bb2 projects[wetkit_bootstrap][download][branch] = 7.x-4.x projects[wetkit_shiny][version] = 4.x-dev From 4fa3d0fa012b632a58fc6823aab2db279d167fc9 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 17:53:33 -0400 Subject: [PATCH 13/22] Issue #2554195: DRUPAL-SA-CORE-2015-003 (Critical) --- drupal-org-core.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org-core.make b/drupal-org-core.make index 1d9cff41..59536fb3 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -1,7 +1,7 @@ api = 2 core = 7.x -projects[drupal][version] = 7.38 +projects[drupal][version] = 7.39 projects[drupal][type] = core ; Patches for Drupal Core From 7168c0c5139fea4767c0ded20a190164349664e5 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 18:19:37 -0400 Subject: [PATCH 14/22] Fixed WetKit Core for Issue #2554209: CTools SA-CONTRIB-2015-141 --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 7cb13e5b..8fe833fa 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -22,7 +22,7 @@ projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x projects[wetkit_core][version] = 4.x-dev projects[wetkit_core][subdir] = custom projects[wetkit_core][download][type] = git -projects[wetkit_core][download][revision] = 9ed4a79 +projects[wetkit_core][download][revision] = dea9270 projects[wetkit_core][download][branch] = 7.x-4.x projects[wetkit_demo][version] = 4.x-dev From 6af13cd82a5a7f724afb59684fa3a5b381686485 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 19:19:42 -0400 Subject: [PATCH 15/22] Update changelog.md file. --- CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd58803..99eadb62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # CHANGELOG.md +## v4.0-RC3 + +Security Update(s): + + - Drupal Core + - CTools + +Fixes: + - (Commit: [7168c0c][R4.0-rc3-Commit-7168c0c]) Fixed WetKit Core for #[2554209][R4.0-rc3-Issue-2554209] - CTools SA-CONTRIB-2015-141 + - (Commit: [4fa3d0f][R4.0-rc3-Commit-4fa3d0f]) #[2554195][R4.0-rc3-Issue-2554195] - DRUPAL-SA-CORE-2015-003 (Critical) + - (Commit: [cc16c08][R4.0-rc3-Commit-cc16c08]) Fixed WetKit Bootstrap for Fix for wetkit_bean search input fields. + - (Commit: [b432db8][R4.0-rc3-Commit-b432db8]) Fixed WetKit Bootstrap for Fix for wetkit_bean search input fields. + - (Commit: [528a768][R4.0-rc3-Commit-528a768]) Fixed WetKit Bootstrap for Fix for extra padding on hamburger icon in mobile view. + - (Commit: [653578c][R4.0-rc3-Commit-653578c]) Fixed WetKit Core for #[2298877][R4.0-rc3-Issue-2298877] - Migration doesn't take into account language of host entity + - (Commit: [d4d626c][R4.0-rc3-Commit-d4d626c]) Fixed WetKit Search for Remove patch breaking make build for dependencies. + - (Commit: [fe457a5][R4.0-rc3-Commit-fe457a5]) Fixed WetKit Search for Update Search API makefile + associated features to Solr 5.21 + - (Commit: [97b5b17][R4.0-rc3-Commit-97b5b17]) Fix for incorrect SHA for wetkit_bootstrap. + - (Commit: [91d8029][R4.0-rc3-Commit-91d8029]) Fixed WetKit Language for #[2547781][R4.0-rc3-Issue-2547781] - i18nviews update for plugin fix + - (Commit: [942a08b][R4.0-rc3-Commit-942a08b]) Fixed WetKit Bootstrap for #[2552591][R4.0-rc3-Issue-2552591] - preg_grep in _bootstrap_process_theme_registry_suggestions slow + - (Commit: [65d9136][R4.0-rc3-Commit-65d9136]) Fixed WetKit Bootstrap for #[2552591][R4.0-rc3-Issue-2552591] - preg_grep in _bootstrap_process_theme_registry_suggestions slow + - (Commit: [8c56ad2][R4.0-rc3-Commit-8c56ad2]) Fixed WetKit Bean for #[2545682][R4.0-rc3-Issue-2545682] - Better drupal_alter on wetkit_slide_collection + - (Commit: [bdfafc6][R4.0-rc3-Commit-bdfafc6]) Start work on next release. + ## v4.0-RC2 Security Update(s): @@ -760,6 +783,33 @@ Bug Fixes: + + +[R4.0-rc3-Commit-7168c0c]: http://drupalcode.org/project/wetkit.git/commit/7168c0c +[R4.0-rc3-Commit-4fa3d0f]: http://drupalcode.org/project/wetkit.git/commit/4fa3d0f +[R4.0-rc3-Commit-cc16c08]: http://drupalcode.org/project/wetkit.git/commit/cc16c08 +[R4.0-rc3-Commit-b432db8]: http://drupalcode.org/project/wetkit.git/commit/b432db8 +[R4.0-rc3-Commit-528a768]: http://drupalcode.org/project/wetkit.git/commit/528a768 +[R4.0-rc3-Commit-653578c]: http://drupalcode.org/project/wetkit.git/commit/653578c +[R4.0-rc3-Commit-d4d626c]: http://drupalcode.org/project/wetkit.git/commit/d4d626c +[R4.0-rc3-Commit-fe457a5]: http://drupalcode.org/project/wetkit.git/commit/fe457a5 +[R4.0-rc3-Commit-97b5b17]: http://drupalcode.org/project/wetkit.git/commit/97b5b17 +[R4.0-rc3-Commit-91d8029]: http://drupalcode.org/project/wetkit.git/commit/91d8029 +[R4.0-rc3-Commit-942a08b]: http://drupalcode.org/project/wetkit.git/commit/942a08b +[R4.0-rc3-Commit-65d9136]: http://drupalcode.org/project/wetkit.git/commit/65d9136 +[R4.0-rc3-Commit-8c56ad2]: http://drupalcode.org/project/wetkit.git/commit/8c56ad2 +[R4.0-rc3-Commit-bdfafc6]: http://drupalcode.org/project/wetkit.git/commit/bdfafc6 + + + +[R4.0-rc3-Issue-2554209]: http://drupal.org/node/2554209 +[R4.0-rc3-Issue-2554195]: http://drupal.org/node/2554195 +[R4.0-rc3-Issue-2298877]: http://drupal.org/node/2298877 +[R4.0-rc3-Issue-2547781]: http://drupal.org/node/2547781 +[R4.0-rc3-Issue-2552591]: http://drupal.org/node/2552591 +[R4.0-rc3-Issue-2552591]: http://drupal.org/node/2552591 +[R4.0-rc3-Issue-2545682]: http://drupal.org/node/2545682 + [R4.0-rc2-Commit-0e3f6cf]: http://drupalcode.org/project/wetkit.git/commit/0e3f6cf From dfe0b82051f0b2a66a3fbd67adc84cef5edfbe21 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 19:24:46 -0400 Subject: [PATCH 16/22] Release 1.11 version. --- .gitignore | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cf7629bc..00000000 --- a/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -# Ignore Development Files -compass_app_log.txt -*.DS_Store -*.diff -*.err -*.orig -*.log -*.rej -*.swo -*.swp -*.vi -*.sass-cache - -# Ignore Contributed Modules -/modules/ - -# Ignore Contributed Libraries -/libraries/ - -# Ignore Contributed Themes -/themes/ From c25b3604c8f6c1975492980401e11135e9395bf5 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 21:20:11 -0400 Subject: [PATCH 17/22] Add .gitignore --- .gitignore.example => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitignore.example => .gitignore (100%) diff --git a/.gitignore.example b/.gitignore similarity index 100% rename from .gitignore.example rename to .gitignore From e43dc81f8d02f3ad6b02aa8ea35f6d76771f6cac Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 21:17:37 -0400 Subject: [PATCH 18/22] Release 4.0-rc3 version. --- build-wetkit-dev.make | 2 +- build-wetkit-release.make | 4 +- build-wetkit.make | 2 +- drupal-org-release.make | 10 ++-- drupal-org.make | 104 ++++++++++---------------------------- 5 files changed, 36 insertions(+), 86 deletions(-) diff --git a/build-wetkit-dev.make b/build-wetkit-dev.make index 060b41cf..0b351f6d 100644 --- a/build-wetkit-dev.make +++ b/build-wetkit-dev.make @@ -2,7 +2,7 @@ api = 2 core = 7.x ; Drupal.org packaging standards -projects[drupal][version] = 7.34 +projects[drupal][version] = 7.39 projects[wetkit][type] = profile projects[wetkit][download][type] = git diff --git a/build-wetkit-release.make b/build-wetkit-release.make index 82f19221..c3233849 100644 --- a/build-wetkit-release.make +++ b/build-wetkit-release.make @@ -2,7 +2,7 @@ api = 2 core = 7.x ; Drupal.org packaging standards -projects[drupal][version] = 7.34 +projects[drupal][version] = 7.39 projects[wetkit][type] = profile -projects[wetkit][version] = 4.0-beta1 +projects[wetkit][version] = 4.0-rc3 diff --git a/build-wetkit.make b/build-wetkit.make index 060b41cf..0b351f6d 100644 --- a/build-wetkit.make +++ b/build-wetkit.make @@ -2,7 +2,7 @@ api = 2 core = 7.x ; Drupal.org packaging standards -projects[drupal][version] = 7.34 +projects[drupal][version] = 7.39 projects[wetkit][type] = profile projects[wetkit][download][type] = git diff --git a/drupal-org-release.make b/drupal-org-release.make index c8804b8b..77dca615 100644 --- a/drupal-org-release.make +++ b/drupal-org-release.make @@ -6,13 +6,13 @@ core = 7.x projects[wetkit_admin][version] = 4.0-rc2 projects[wetkit_admin][subdir] = custom -projects[wetkit_bean][version] = 4.0-rc2 +projects[wetkit_bean][version] = 4.0-rc3 projects[wetkit_bean][subdir] = custom projects[wetkit_breadcrumbs][version] = 4.1 projects[wetkit_breadcrumbs][subdir] = custom -projects[wetkit_core][version] = 4.0-rc3 +projects[wetkit_core][version] = 4.0-rc4 projects[wetkit_core][subdir] = custom projects[wetkit_demo][version] = 4.1 @@ -24,7 +24,7 @@ projects[wetkit_deployment][subdir] = custom projects[wetkit_images][version] = 4.1 projects[wetkit_images][subdir] = custom -projects[wetkit_language][version] = 4.0-rc2 +projects[wetkit_language][version] = 4.0-rc3 projects[wetkit_language][subdir] = custom projects[wetkit_layouts][version] = 4.0-rc2 @@ -45,7 +45,7 @@ projects[wetkit_og][subdir] = custom projects[wetkit_pages][version] = 4.1 projects[wetkit_pages][subdir] = custom -projects[wetkit_search][version] = 4.0-rc2 +projects[wetkit_search][version] = 4.0-rc3 projects[wetkit_search][subdir] = custom projects[wetkit_test][version] = 4.1 @@ -71,7 +71,7 @@ projects[wetkit_wysiwyg][subdir] = custom projects[wetkit_ember][version] = 4.1 projects[wetkit_ember][type] = theme -projects[wetkit_bootstrap][version] = 4.0-rc2 +projects[wetkit_bootstrap][version] = 4.0-rc3 projects[wetkit_bootstrap][type] = theme projects[wetkit_shiny][version] = 4.0 diff --git a/drupal-org.make b/drupal-org.make index 8fe833fa..77dca615 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -3,126 +3,76 @@ core = 7.x ; WxT Foundation (Custom) -projects[wetkit_admin][version] = 4.x-dev +projects[wetkit_admin][version] = 4.0-rc2 projects[wetkit_admin][subdir] = custom -projects[wetkit_admin][download][type] = git -projects[wetkit_admin][download][branch] = 7.x-4.x -projects[wetkit_bean][version] = 4.x-dev +projects[wetkit_bean][version] = 4.0-rc3 projects[wetkit_bean][subdir] = custom -projects[wetkit_bean][download][type] = git -projects[wetkit_bean][download][revision] = 130d41f -projects[wetkit_bean][download][branch] = 7.x-4.x -projects[wetkit_breadcrumbs][version] = 4.x-dev +projects[wetkit_breadcrumbs][version] = 4.1 projects[wetkit_breadcrumbs][subdir] = custom -projects[wetkit_breadcrumbs][download][type] = git -projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x -projects[wetkit_core][version] = 4.x-dev +projects[wetkit_core][version] = 4.0-rc4 projects[wetkit_core][subdir] = custom -projects[wetkit_core][download][type] = git -projects[wetkit_core][download][revision] = dea9270 -projects[wetkit_core][download][branch] = 7.x-4.x -projects[wetkit_demo][version] = 4.x-dev +projects[wetkit_demo][version] = 4.1 projects[wetkit_demo][subdir] = custom -projects[wetkit_demo][download][type] = git -projects[wetkit_demo][download][branch] = 7.x-4.x -projects[wetkit_deployment][version] = 4.x-dev +projects[wetkit_deployment][version] = 4.1 projects[wetkit_deployment][subdir] = custom -projects[wetkit_deployment][download][type] = git -projects[wetkit_deployment][download][branch] = 7.x-4.x -projects[wetkit_images][version] = 4.x-dev +projects[wetkit_images][version] = 4.1 projects[wetkit_images][subdir] = custom -projects[wetkit_images][download][type] = git -projects[wetkit_images][download][branch] = 7.x-4.x -projects[wetkit_language][version] = 4.x-dev +projects[wetkit_language][version] = 4.0-rc3 projects[wetkit_language][subdir] = custom -projects[wetkit_language][download][type] = git -projects[wetkit_language][download][revision] = cce4b0c -projects[wetkit_language][download][branch] = 7.x-4.x -projects[wetkit_layouts][version] = 4.x-dev +projects[wetkit_layouts][version] = 4.0-rc2 projects[wetkit_layouts][subdir] = custom -projects[wetkit_layouts][download][type] = git -projects[wetkit_layouts][download][branch] = 7.x-4.x -projects[wetkit_menu][version] = 4.x-dev +projects[wetkit_menu][version] = 4.0-rc2 projects[wetkit_menu][subdir] = custom -projects[wetkit_menu][download][type] = git -projects[wetkit_menu][download][branch] = 7.x-4.x -projects[wetkit_metatag][version] = 4.x-dev +projects[wetkit_metatag][version] = 4.0 projects[wetkit_metatag][subdir] = custom -projects[wetkit_metatag][download][type] = git -projects[wetkit_metatag][download][branch] = 7.x-4.x -projects[wetkit_migrate][version] = 4.x-dev +projects[wetkit_migrate][version] = 4.0-rc3 projects[wetkit_migrate][subdir] = custom -projects[wetkit_migrate][download][type] = git -projects[wetkit_migrate][download][branch] = 7.x-4.x -projects[wetkit_og][version] = 4.x-dev +projects[wetkit_og][version] = 4.0 projects[wetkit_og][subdir] = custom -projects[wetkit_og][download][type] = git -projects[wetkit_og][download][branch] = 7.x-4.x -projects[wetkit_pages][version] = 4.x-dev +projects[wetkit_pages][version] = 4.1 projects[wetkit_pages][subdir] = custom -projects[wetkit_pages][download][type] = git -projects[wetkit_pages][download][branch] = 7.x-4.x -projects[wetkit_search][version] = 4.x-dev +projects[wetkit_search][version] = 4.0-rc3 projects[wetkit_search][subdir] = custom -projects[wetkit_search][download][type] = git -projects[wetkit_search][download][revision] = 4255904 -projects[wetkit_search][download][branch] = 7.x-4.x -projects[wetkit_test][version] = 4.x-dev +projects[wetkit_test][version] = 4.1 projects[wetkit_test][subdir] = custom -projects[wetkit_test][download][type] = git -projects[wetkit_test][download][branch] = 7.x-4.x -projects[wetkit_theme][version] = 4.x-dev +projects[wetkit_theme][version] = 4.0-rc2 projects[wetkit_theme][subdir] = custom -projects[wetkit_theme][download][type] = git -projects[wetkit_theme][download][branch] = 7.x-4.x -projects[wetkit_users][version] = 4.x-dev +projects[wetkit_users][version] = 4.1 projects[wetkit_users][subdir] = custom -projects[wetkit_users][download][type] = git -projects[wetkit_users][download][branch] = 7.x-4.x -projects[wetkit_wetboew][version] = 4.x-dev +projects[wetkit_wetboew][version] = 4.0-rc2 projects[wetkit_wetboew][subdir] = custom -projects[wetkit_wetboew][download][type] = git -projects[wetkit_wetboew][download][branch] = 7.x-4.x -projects[wetkit_widgets][version] = 4.x-dev +projects[wetkit_widgets][version] = 4.1 projects[wetkit_widgets][subdir] = custom -projects[wetkit_widgets][download][type] = git -projects[wetkit_widgets][download][branch] = 7.x-4.x -projects[wetkit_wysiwyg][version] = 4.x-dev +projects[wetkit_wysiwyg][version] = 4.1 projects[wetkit_wysiwyg][subdir] = custom -projects[wetkit_wysiwyg][download][type] = git -projects[wetkit_wysiwyg][download][branch] = 7.x-4.x ; WxT Foundation (Themes) -projects[wetkit_ember][version] = 4.x-dev -projects[wetkit_ember][download][type] = git -projects[wetkit_ember][download][branch] = 7.x-4.x +projects[wetkit_ember][version] = 4.1 +projects[wetkit_ember][type] = theme -projects[wetkit_bootstrap][version] = 4.x-dev -projects[wetkit_bootstrap][download][type] = git -projects[wetkit_bootstrap][download][revision] = 30c0bb2 -projects[wetkit_bootstrap][download][branch] = 7.x-4.x +projects[wetkit_bootstrap][version] = 4.0-rc3 +projects[wetkit_bootstrap][type] = theme -projects[wetkit_shiny][version] = 4.x-dev -projects[wetkit_shiny][download][type] = git -projects[wetkit_shiny][download][branch] = 7.x-4.x +projects[wetkit_shiny][version] = 4.0 +projects[wetkit_shiny][type] = theme From 1f4869964e1580cfcdad91d2ccbf7e56e82dba9d Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 21:22:45 -0400 Subject: [PATCH 19/22] Restore .gitignore.example file. --- .gitignore.example | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitignore.example diff --git a/.gitignore.example b/.gitignore.example new file mode 100644 index 00000000..cf7629bc --- /dev/null +++ b/.gitignore.example @@ -0,0 +1,21 @@ +# Ignore Development Files +compass_app_log.txt +*.DS_Store +*.diff +*.err +*.orig +*.log +*.rej +*.swo +*.swp +*.vi +*.sass-cache + +# Ignore Contributed Modules +/modules/ + +# Ignore Contributed Libraries +/libraries/ + +# Ignore Contributed Themes +/themes/ From bf3bc8561346a666cbd602ce29af74dd72033980 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Wed, 19 Aug 2015 22:53:10 -0400 Subject: [PATCH 20/22] Release 4.0-rc3 version. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 77dca615..08ad757f 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -12,7 +12,7 @@ projects[wetkit_bean][subdir] = custom projects[wetkit_breadcrumbs][version] = 4.1 projects[wetkit_breadcrumbs][subdir] = custom -projects[wetkit_core][version] = 4.0-rc4 +projects[wetkit_core][version] = 4.0-rc5 projects[wetkit_core][subdir] = custom projects[wetkit_demo][version] = 4.1 From 88b52cf69772cfbf3d1f1ba89eb4a4a1acae9629 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Thu, 20 Aug 2015 08:48:33 -0400 Subject: [PATCH 21/22] Release 4.0-rc3 version. --- drupal-org.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org.make b/drupal-org.make index 08ad757f..d68ef4d5 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -12,7 +12,7 @@ projects[wetkit_bean][subdir] = custom projects[wetkit_breadcrumbs][version] = 4.1 projects[wetkit_breadcrumbs][subdir] = custom -projects[wetkit_core][version] = 4.0-rc5 +projects[wetkit_core][version] = 4.0-rc6 projects[wetkit_core][subdir] = custom projects[wetkit_demo][version] = 4.1 From 792a6029aa5041e615f27f321d06cd1842be3f88 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Thu, 20 Aug 2015 09:38:20 -0400 Subject: [PATCH 22/22] Release 4.0-rc3 version. --- drupal-org-release.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-org-release.make b/drupal-org-release.make index 77dca615..d68ef4d5 100644 --- a/drupal-org-release.make +++ b/drupal-org-release.make @@ -12,7 +12,7 @@ projects[wetkit_bean][subdir] = custom projects[wetkit_breadcrumbs][version] = 4.1 projects[wetkit_breadcrumbs][subdir] = custom -projects[wetkit_core][version] = 4.0-rc4 +projects[wetkit_core][version] = 4.0-rc6 projects[wetkit_core][subdir] = custom projects[wetkit_demo][version] = 4.1