Skip to content

Commit

Permalink
Merge pull request #1793 from sylus/7.x-4.x
Browse files Browse the repository at this point in the history
Prepare for release of Drupal WxT v4.2.
  • Loading branch information
sylus committed Jan 19, 2016
2 parents 10f13c0 + 4777c03 commit bf1dc0b
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 116 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG.md

## v4.2 (In Development)
## v4.2

Security Update(s):

Expand Down Expand Up @@ -44,7 +44,7 @@ Fixes:
- (Commit: [2c02bfd][R4.2-Commit-2c02bfd]) Fixed WetKit Theme for Disable popover by default.
- (Commit: [8b92a01][R4.2-Commit-8b92a01]) Fixed WetKit Migration for Fix for missing taxonomy item.
- (Commit: [edf00f7][R4.2-Commit-edf00f7]) Fixed WetKit Bean for Update wetkit_bean export and remove default image style highlighted.
- (Commit: [5ac7039][R4.2-Commit-5ac7039]) Fixed WetKit Core for Update link modul from 1.3 to 1.4.
- (Commit: [5ac7039][R4.2-Commit-5ac7039]) Fixed WetKit Core for Update link module from 1.3 to 1.4.
- (Commit: [86c4326][R4.2-Commit-86c4326]) Fixed WetKit Core for #[1344672][R4.2-Issue-1344672] - Field translation (entity_translation) support
- (Commit: [48a8ea0][R4.2-Commit-48a8ea0]) Update changelog.md file.
- (Commit: [ccbe539][R4.2-Commit-ccbe539]) Fixed WetKit Metatag for #[2615858][R4.2-Issue-2615858] - Metatag 1.7 release caused metatag translation deletions.
Expand All @@ -58,7 +58,7 @@ Fixes:
- (Commit: [45d8a9c][R4.2-Commit-45d8a9c]) Fixed WetKit Core for Field Group DRUPAL-SA-CONTRIB-2016-001.
- (Commit: [9dd28ec][R4.2-Commit-9dd28ec]) Fixed WetKit WYSIWYG for Update linkit to the latest official version 3.5.
- (Commit: [15a5529][R4.2-Commit-15a5529]) Fixed WetKit Breadcrumbs for #[2614240][R4.2-Issue-2614240] - Remove "Bootstrap 3 compatibility"
- (Commit: [cbda96a][R4.2-Commit-cbda96a]) Update TravisCI drush runner to 8.0.2.
- (Commit: [cbda96a][R4.2-Commit-cbda96a]) Update TravisCI Drush runner to 8.0.2.
- (Commit: [90a8a25][R4.2-Commit-90a8a25]) Drush versions + make put themes into modules folder (drush #1781).
- (Commit: [8f497d6][R4.2-Commit-8f497d6]) Fixed WetKit Test for Update Drupal Extension for Behat.
- (Commit: [7ccf29f][R4.2-Commit-7ccf29f]) Fixed WetKit Test for Update Drupal Extension for Behat.
Expand Down
3 changes: 3 additions & 0 deletions drupal-org-dev.make
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,16 @@ projects[wetkit_wysiwyg][download][branch] = 7.x-4.x
; WxT Foundation (Themes)

projects[wetkit_ember][version] = 4.x-dev
projects[wetkit_ember][type] = theme
projects[wetkit_ember][download][type] = git
projects[wetkit_ember][download][branch] = 7.x-4.x

projects[wetkit_bootstrap][version] = 4.x-dev
projects[wetkit_bootstrap][type] = theme
projects[wetkit_bootstrap][download][type] = git
projects[wetkit_bootstrap][download][branch] = 7.x-4.x

projects[wetkit_shiny][version] = 4.x-dev
projects[wetkit_shiny][type] = theme
projects[wetkit_shiny][download][type] = git
projects[wetkit_shiny][download][branch] = 7.x-4.x
38 changes: 19 additions & 19 deletions drupal-org-release.make
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@ core = 7.x

; WxT Foundation (Custom)

projects[wetkit_admin][version] = 4.1
projects[wetkit_admin][version] = 4.2
projects[wetkit_admin][subdir] = custom

projects[wetkit_bean][version] = 4.1
projects[wetkit_bean][version] = 4.2
projects[wetkit_bean][subdir] = custom

projects[wetkit_breadcrumbs][version] = 4.2
projects[wetkit_breadcrumbs][version] = 4.3
projects[wetkit_breadcrumbs][subdir] = custom

projects[wetkit_core][version] = 4.1
projects[wetkit_core][version] = 4.2
projects[wetkit_core][subdir] = custom

projects[wetkit_demo][version] = 4.1
projects[wetkit_demo][subdir] = custom

projects[wetkit_deployment][version] = 4.3
projects[wetkit_deployment][version] = 4.4
projects[wetkit_deployment][subdir] = custom

projects[wetkit_images][version] = 4.3
projects[wetkit_images][version] = 4.4
projects[wetkit_images][subdir] = custom

projects[wetkit_language][version] = 4.1
projects[wetkit_language][version] = 4.2
projects[wetkit_language][subdir] = custom

projects[wetkit_layouts][version] = 4.1
projects[wetkit_layouts][version] = 4.2
projects[wetkit_layouts][subdir] = custom

projects[wetkit_menu][version] = 4.1
projects[wetkit_menu][version] = 4.2
projects[wetkit_menu][subdir] = custom

projects[wetkit_metatag][version] = 4.2
projects[wetkit_metatag][version] = 4.3
projects[wetkit_metatag][subdir] = custom

projects[wetkit_migrate][version] = 4.0
projects[wetkit_migrate][version] = 4.1
projects[wetkit_migrate][subdir] = custom

projects[wetkit_og][version] = 4.0
Expand All @@ -45,13 +45,13 @@ projects[wetkit_og][subdir] = custom
projects[wetkit_pages][version] = 4.2
projects[wetkit_pages][subdir] = custom

projects[wetkit_search][version] = 4.0
projects[wetkit_search][version] = 4.1
projects[wetkit_search][subdir] = custom

projects[wetkit_test][version] = 4.3
projects[wetkit_test][version] = 4.4
projects[wetkit_test][subdir] = custom

projects[wetkit_theme][version] = 4.0
projects[wetkit_theme][version] = 4.2
projects[wetkit_theme][subdir] = custom

projects[wetkit_users][version] = 4.1
Expand All @@ -60,21 +60,21 @@ projects[wetkit_users][subdir] = custom
projects[wetkit_webform][version] = 4.0
projects[wetkit_webform][subdir] = custom

projects[wetkit_wetboew][version] = 4.0
projects[wetkit_wetboew][version] = 4.1
projects[wetkit_wetboew][subdir] = custom

projects[wetkit_widgets][version] = 4.3
projects[wetkit_widgets][version] = 4.4
projects[wetkit_widgets][subdir] = custom

projects[wetkit_wysiwyg][version] = 4.2
projects[wetkit_wysiwyg][version] = 4.3
projects[wetkit_wysiwyg][subdir] = custom

; WxT Foundation (Themes)

projects[wetkit_ember][version] = 4.2
projects[wetkit_ember][version] = 4.3
projects[wetkit_ember][type] = theme

projects[wetkit_bootstrap][version] = 4.1
projects[wetkit_bootstrap][version] = 4.2
projects[wetkit_bootstrap][type] = theme

projects[wetkit_shiny][version] = 4.0
Expand Down
119 changes: 25 additions & 94 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -3,148 +3,79 @@ core = 7.x

; WxT Foundation (Custom)

projects[wetkit_admin][version] = 4.x-dev
projects[wetkit_admin][version] = 4.2
projects[wetkit_admin][subdir] = custom
projects[wetkit_admin][download][type] = git
projects[wetkit_admin][download][revision] = a00c387
projects[wetkit_admin][download][branch] = 7.x-4.x

projects[wetkit_bean][version] = 4.x-dev
projects[wetkit_bean][version] = 4.2
projects[wetkit_bean][subdir] = custom
projects[wetkit_bean][download][type] = git
projects[wetkit_bean][download][revision] = d987490
projects[wetkit_bean][download][branch] = 7.x-4.x

projects[wetkit_breadcrumbs][version] = 4.x-dev
projects[wetkit_breadcrumbs][version] = 4.4
projects[wetkit_breadcrumbs][subdir] = custom
projects[wetkit_breadcrumbs][download][type] = git
projects[wetkit_breadcrumbs][download][revision] = f97c33c
projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x

projects[wetkit_core][version] = 4.x-dev
projects[wetkit_core][version] = 4.2
projects[wetkit_core][subdir] = custom
projects[wetkit_core][download][type] = git
projects[wetkit_core][download][revision] = 19e2970
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.4
projects[wetkit_deployment][subdir] = custom
projects[wetkit_deployment][download][type] = git
projects[wetkit_deployment][download][revision] = 04c94c1
projects[wetkit_deployment][download][branch] = 7.x-4.x

projects[wetkit_images][version] = 4.x-dev
projects[wetkit_images][version] = 4.4
projects[wetkit_images][subdir] = custom
projects[wetkit_images][download][type] = git
projects[wetkit_images][download][revision] = 5290165
projects[wetkit_images][download][branch] = 7.x-4.x

projects[wetkit_language][version] = 4.x-dev
projects[wetkit_language][version] = 4.2
projects[wetkit_language][subdir] = custom
projects[wetkit_language][download][type] = git
projects[wetkit_language][download][revision] = e677bff
projects[wetkit_language][download][branch] = 7.x-4.x

projects[wetkit_layouts][version] = 4.x-dev
projects[wetkit_layouts][version] = 4.2
projects[wetkit_layouts][subdir] = custom
projects[wetkit_layouts][download][type] = git
projects[wetkit_layouts][download][revision] = e49412f
projects[wetkit_layouts][download][branch] = 7.x-4.x

projects[wetkit_menu][version] = 4.x-dev
projects[wetkit_menu][version] = 4.2
projects[wetkit_menu][subdir] = custom
projects[wetkit_menu][download][type] = git
projects[wetkit_menu][download][revision] = 92e9961
projects[wetkit_menu][download][branch] = 7.x-4.x

projects[wetkit_metatag][version] = 4.x-dev
projects[wetkit_metatag][version] = 4.3
projects[wetkit_metatag][subdir] = custom
projects[wetkit_metatag][download][type] = git
projects[wetkit_metatag][download][revision] = abd2ab6
projects[wetkit_metatag][download][branch] = 7.x-4.x

projects[wetkit_migrate][version] = 4.x-dev
projects[wetkit_migrate][version] = 4.1
projects[wetkit_migrate][subdir] = custom
projects[wetkit_migrate][download][type] = git
projects[wetkit_migrate][download][revision] = 0e9d9ea
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.2
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.1
projects[wetkit_search][subdir] = custom
projects[wetkit_search][download][type] = git
projects[wetkit_search][download][revision] = c6cdf63
projects[wetkit_search][download][branch] = 7.x-4.x

projects[wetkit_test][version] = 4.x-dev
projects[wetkit_test][version] = 4.4
projects[wetkit_test][subdir] = custom
projects[wetkit_test][download][type] = git
projects[wetkit_test][download][revision] = 562ec6e
projects[wetkit_test][download][branch] = 7.x-4.x

projects[wetkit_theme][version] = 4.x-dev
projects[wetkit_theme][version] = 4.2
projects[wetkit_theme][subdir] = custom
projects[wetkit_theme][download][type] = git
projects[wetkit_theme][download][revision] = 98653c4
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_webform][version] = 4.x-dev
projects[wetkit_webform][version] = 4.0
projects[wetkit_webform][subdir] = custom
projects[wetkit_webform][download][type] = git
projects[wetkit_webform][download][branch] = 7.x-4.x

projects[wetkit_wetboew][version] = 4.x-dev
projects[wetkit_wetboew][version] = 4.1
projects[wetkit_wetboew][subdir] = custom
projects[wetkit_wetboew][download][type] = git
projects[wetkit_wetboew][download][revision] = 5617a39
projects[wetkit_wetboew][download][branch] = 7.x-4.x

projects[wetkit_widgets][version] = 4.x-dev
projects[wetkit_widgets][version] = 4.4
projects[wetkit_widgets][subdir] = custom
projects[wetkit_widgets][download][type] = git
projects[wetkit_widgets][download][revision] = 9e1a018
projects[wetkit_widgets][download][branch] = 7.x-4.x

projects[wetkit_wysiwyg][version] = 4.x-dev
projects[wetkit_wysiwyg][version] = 4.3
projects[wetkit_wysiwyg][subdir] = custom
projects[wetkit_wysiwyg][download][type] = git
projects[wetkit_wysiwyg][download][revision] = 80aeebd
projects[wetkit_wysiwyg][download][branch] = 7.x-4.x

; WxT Foundation (Themes)

projects[wetkit_ember][version] = 4.x-dev
projects[wetkit_ember][version] = 4.3
projects[wetkit_ember][type] = theme
projects[wetkit_ember][download][type] = git
projects[wetkit_ember][download][revision] = 7fd3ae4
projects[wetkit_ember][download][branch] = 7.x-4.x

projects[wetkit_bootstrap][version] = 4.x-dev
projects[wetkit_bootstrap][version] = 4.3
projects[wetkit_bootstrap][type] = theme
projects[wetkit_bootstrap][download][type] = git
projects[wetkit_bootstrap][download][revision] = d32d91a
projects[wetkit_bootstrap][download][branch] = 7.x-4.x

projects[wetkit_shiny][version] = 4.x-dev
projects[wetkit_shiny][version] = 4.0
projects[wetkit_shiny][type] = theme
projects[wetkit_shiny][download][type] = git
projects[wetkit_shiny][download][branch] = 7.x-4.x

0 comments on commit bf1dc0b

Please sign in to comment.