Skip to content

Commit

Permalink
Merge pull request #1659 from sylus/7.x-4.x
Browse files Browse the repository at this point in the history
Updates for 4.x branch.
  • Loading branch information
sylus committed Apr 14, 2015
2 parents b5cc4ee + b8db260 commit 750ebd5
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 117 deletions.
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,23 @@ Features:

Fixes:

- (Commit: [76d7793][R4.0-rc1-Commit-76d7793]) Fixed WetKit Core for #[2423861][R4.0-rc1-Issue-2423861] - Updates for WetKit Core (1.9, 4.0-beta2)
- (Commit: [55f8702][R4.0-rc1-Commit-55f8702]) Prepare for 4.0-rc1 release.
- (Commit: [e8a7269][R4.0-rc1-Commit-e8a7269]) Fixed WetKit Admin for Fix for invalid patch format.
- (Commit: [50a5678][R4.0-rc1-Commit-50a5678]) Fixed WetKit Test for #[2457949][R4.0-rc1-Issue-2457949] - Behat tests expansion
- (Commit: [5e5be8c][R4.0-rc1-Commit-5e5be8c]) Fixed WetKit Pages for #[2460287][R4.0-rc1-Issue-2460287] - Landing page creation confirmation message always says Sutherland
- (Commit: [7747838][R4.0-rc1-Commit-7747838]) Fixed WetKit Core for #[2464421][R4.0-rc1-Issue-2464421] - Password Policy Security Release
- (Commit: [473d043][R4.0-rc1-Commit-473d043]) Fixed WetKit Bootstrap for #[2464413][R4.0-rc1-Issue-2464413] - Add support for GCWeb cdn for Megamenu + Footer
- (Commit: [18b4762][R4.0-rc1-Commit-18b4762]) Fixed WetKit WET-BOEW for Missing logic for theme.min.js.
- (Commit: [2a51bca][R4.0-rc1-Commit-2a51bca]) Fixed WetKit Bootstrap for Minor CSS adjustment for Dashboard screen.
- (Commit: [1d00d8f][R4.0-rc1-Commit-1d00d8f]) Fixed WetKit Menu for Remove deprecated WxT requirements functionality.
- (Commit: [d9d2fe3][R4.0-rc1-Commit-d9d2fe3]) Fixed WetKit Bootstrap for Improve display of status report table.
- (Commit: [62cd71a][R4.0-rc1-Commit-62cd71a]) Fixed WetKit Admin for Fix for invalid contexts causing ctools missing string.
- (Commit: [664fde7][R4.0-rc1-Commit-664fde7]) Fixed WetKit Theme for Fix for hidden themes displaying on install.
- (Commit: [f04bc92][R4.0-rc1-Commit-f04bc92]) Fixed WetKit Pages for Fix use of hardcoded layout name.
- (Commit: [b90eb27][R4.0-rc1-Commit-b90eb27]) Fixed WetKit Images for Fix incorrect label for view modes.
- (Commit: [bd07962][R4.0-rc1-Commit-bd07962]) Fixed WetKit Core for Remove patch for CTools string context.
- (Commit: [b45d657][R4.0-rc1-Commit-b45d657]) Update CHANGELOG.md file.
- (Commit: [9a29304][R4.0-rc1-Commit-9a29304]) Update CHANGELOG.md file.
- (Commit: [596a470][R4.0-rc1-Commit-596a470]) Fixed WetKit Core for #[2352895][R4.0-rc1-Issue-2352895] - Pathauto Persist?
- (Commit: [a34f8ac][R4.0-rc1-Commit-a34f8ac]) Update CHANGELOG.md file.
Expand Down Expand Up @@ -588,8 +605,29 @@ Bug Fixes:

<!-- Commits R4.0-rc1 -->

[R4.0-rc1-Commit-76d7793]: http://drupalcode.org/project/wetkit.git/commit/76d7793
[R4.0-rc1-Commit-55f8702]: http://drupalcode.org/project/wetkit.git/commit/55f8702
[R4.0-rc1-Commit-e8a7269]: http://drupalcode.org/project/wetkit.git/commit/e8a7269
[R4.0-rc1-Commit-50a5678]: http://drupalcode.org/project/wetkit.git/commit/50a5678
[R4.0-rc1-Commit-5e5be8c]: http://drupalcode.org/project/wetkit.git/commit/5e5be8c
[R4.0-rc1-Commit-b5cc4ee]: http://drupalcode.org/project/wetkit.git/commit/b5cc4ee
[R4.0-rc1-Commit-7747838]: http://drupalcode.org/project/wetkit.git/commit/7747838
[R4.0-rc1-Commit-473d043]: http://drupalcode.org/project/wetkit.git/commit/473d043
[R4.0-rc1-Commit-18b4762]: http://drupalcode.org/project/wetkit.git/commit/18b4762
[R4.0-rc1-Commit-1d9fa4e]: http://drupalcode.org/project/wetkit.git/commit/1d9fa4e
[R4.0-rc1-Commit-2a51bca]: http://drupalcode.org/project/wetkit.git/commit/2a51bca
[R4.0-rc1-Commit-1d00d8f]: http://drupalcode.org/project/wetkit.git/commit/1d00d8f
[R4.0-rc1-Commit-d9d2fe3]: http://drupalcode.org/project/wetkit.git/commit/d9d2fe3
[R4.0-rc1-Commit-d1b5c74]: http://drupalcode.org/project/wetkit.git/commit/d1b5c74
[R4.0-rc1-Commit-62cd71a]: http://drupalcode.org/project/wetkit.git/commit/62cd71a
[R4.0-rc1-Commit-664fde7]: http://drupalcode.org/project/wetkit.git/commit/664fde7
[R4.0-rc1-Commit-f04bc92]: http://drupalcode.org/project/wetkit.git/commit/f04bc92
[R4.0-rc1-Commit-b90eb27]: http://drupalcode.org/project/wetkit.git/commit/b90eb27
[R4.0-rc1-Commit-bd07962]: http://drupalcode.org/project/wetkit.git/commit/bd07962
[R4.0-rc1-Commit-b45d657]: http://drupalcode.org/project/wetkit.git/commit/b45d657
[R4.0-rc1-Commit-9a29304]: http://drupalcode.org/project/wetkit.git/commit/9a29304
[R4.0-rc1-Commit-596a470]: http://drupalcode.org/project/wetkit.git/commit/596a470
[R4.0-rc1-Commit-2048b96]: http://drupalcode.org/project/wetkit.git/commit/2048b96
[R4.0-rc1-Commit-a34f8ac]: http://drupalcode.org/project/wetkit.git/commit/a34f8ac
[R4.0-rc1-Commit-9a0da7b]: http://drupalcode.org/project/wetkit.git/commit/9a0da7b
[R4.0-rc1-Commit-6f14f60]: http://drupalcode.org/project/wetkit.git/commit/6f14f60
Expand Down Expand Up @@ -769,6 +807,11 @@ Bug Fixes:

<!-- Issues R4.0-rc1 -->

[R4.0-rc1-Issue-2423861]: http://drupal.org/node/2423861
[R4.0-rc1-Issue-2457949]: http://drupal.org/node/2457949
[R4.0-rc1-Issue-2460287]: http://drupal.org/node/2460287
[R4.0-rc1-Issue-2464421]: http://drupal.org/node/2464421
[R4.0-rc1-Issue-2464413]: http://drupal.org/node/2464413
[R4.0-rc1-Issue-2352895]: http://drupal.org/node/2352895
[R4.0-rc1-Issue-2457949]: http://drupal.org/node/2457949
[R4.0-rc1-Issue-2423861]: http://drupal.org/node/2423861
Expand Down
48 changes: 24 additions & 24 deletions drupal-org-release.make
Original file line number Diff line number Diff line change
Expand Up @@ -3,76 +3,76 @@ core = 7.x

; WxT Foundation (Custom)

projects[wetkit_admin][version] = 4.0-beta1
projects[wetkit_admin][version] = 4.0-rc1
projects[wetkit_admin][subdir] = custom

projects[wetkit_bean][version] = 4.0-beta2
projects[wetkit_bean][version] = 4.0-rc1
projects[wetkit_bean][subdir] = custom

projects[wetkit_breadcrumbs][version] = 4.0-beta1
projects[wetkit_breadcrumbs][version] = 4.0
projects[wetkit_breadcrumbs][subdir] = custom

projects[wetkit_core][version] = 4.0-beta1
projects[wetkit_core][version] = 4.0-rc1
projects[wetkit_core][subdir] = custom

projects[wetkit_demo][version] = 4.0-beta1
projects[wetkit_demo][version] = 4.0
projects[wetkit_demo][subdir] = custom

projects[wetkit_deployment][version] = 4.0-beta1
projects[wetkit_deployment][version] = 4.0
projects[wetkit_deployment][subdir] = custom

projects[wetkit_images][version] = 4.0-beta2
projects[wetkit_images][version] = 4.0
projects[wetkit_images][subdir] = custom

projects[wetkit_language][version] = 4.0-beta1
projects[wetkit_language][version] = 4.0-rc1
projects[wetkit_language][subdir] = custom

projects[wetkit_layouts][version] = 4.0-beta1
projects[wetkit_layouts][version] = 4.0-rc1
projects[wetkit_layouts][subdir] = custom

projects[wetkit_menu][version] = 4.0-beta1
projects[wetkit_menu][version] = 4.0-rc1
projects[wetkit_menu][subdir] = custom

projects[wetkit_metatag][version] = 4.0-beta1
projects[wetkit_metatag][version] = 4.0
projects[wetkit_metatag][subdir] = custom

projects[wetkit_migrate][version] = 4.0-beta2
projects[wetkit_migrate][version] = 4.0-rc1
projects[wetkit_migrate][subdir] = custom

projects[wetkit_og][version] = 4.0-beta1
projects[wetkit_og][version] = 4.0
projects[wetkit_og][subdir] = custom

projects[wetkit_pages][version] = 4.0-beta1
projects[wetkit_pages][version] = 4.0
projects[wetkit_pages][subdir] = custom

projects[wetkit_search][version] = 4.0-beta1
projects[wetkit_search][version] = 4.0-rc1
projects[wetkit_search][subdir] = custom

projects[wetkit_test][version] = 4.0-beta1
projects[wetkit_test][version] = 4.0
projects[wetkit_test][subdir] = custom

projects[wetkit_theme][version] = 4.0-beta1
projects[wetkit_theme][version] = 4.0-rc1
projects[wetkit_theme][subdir] = custom

projects[wetkit_users][version] = 4.0-beta1
projects[wetkit_users][version] = 4.0
projects[wetkit_users][subdir] = custom

projects[wetkit_wetboew][version] = 4.0-beta1
projects[wetkit_wetboew][version] = 4.0-rc1
projects[wetkit_wetboew][subdir] = custom

projects[wetkit_widgets][version] = 4.0-beta2
projects[wetkit_widgets][version] = 4.0
projects[wetkit_widgets][subdir] = custom

projects[wetkit_wysiwyg][version] = 4.0-beta1
projects[wetkit_wysiwyg][version] = 4.0
projects[wetkit_wysiwyg][subdir] = custom

; WxT Foundation (Themes)

projects[wetkit_ember][version] = 4.0-beta1
projects[wetkit_ember][version] = 4.0
projects[wetkit_ember][type] = theme

projects[wetkit_bootstrap][version] = 4.0-beta1
projects[wetkit_bootstrap][version] = 4.0-rc1
projects[wetkit_bootstrap][type] = theme

projects[wetkit_shiny][version] = 4.0-beta1
projects[wetkit_shiny][version] = 4.0
projects[wetkit_shiny][type] = theme
120 changes: 27 additions & 93 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -3,142 +3,76 @@ core = 7.x

; WxT Foundation (Custom)

projects[wetkit_admin][version] = 4.x-dev
projects[wetkit_admin][version] = 4.0-rc1
projects[wetkit_admin][subdir] = custom
projects[wetkit_admin][download][type] = git
projects[wetkit_admin][download][revision] = fa24d91
projects[wetkit_admin][download][branch] = 7.x-4.x

projects[wetkit_bean][version] = 4.x-dev
projects[wetkit_bean][version] = 4.0-rc1
projects[wetkit_bean][subdir] = custom
projects[wetkit_bean][download][type] = git
projects[wetkit_bean][download][revision] = a761474
projects[wetkit_bean][download][branch] = 7.x-4.x

projects[wetkit_breadcrumbs][version] = 4.x-dev
projects[wetkit_breadcrumbs][version] = 4.0
projects[wetkit_breadcrumbs][subdir] = custom
projects[wetkit_breadcrumbs][download][type] = git
projects[wetkit_breadcrumbs][download][revision] = 8c7f260
projects[wetkit_breadcrumbs][download][branch] = 7.x-4.x

projects[wetkit_core][version] = 4.x-dev
projects[wetkit_core][version] = 4.0-rc1
projects[wetkit_core][subdir] = custom
projects[wetkit_core][download][type] = git
projects[wetkit_core][download][revision] = 0a82c66
projects[wetkit_core][download][branch] = 7.x-4.x

projects[wetkit_demo][version] = 4.x-dev
projects[wetkit_demo][version] = 4.0
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.0
projects[wetkit_deployment][subdir] = custom
projects[wetkit_deployment][download][type] = git
projects[wetkit_deployment][download][revision] = 160c318
projects[wetkit_deployment][download][branch] = 7.x-4.x

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

projects[wetkit_language][version] = 4.x-dev
projects[wetkit_language][version] = 4.0-rc1
projects[wetkit_language][subdir] = custom
projects[wetkit_language][download][type] = git
projects[wetkit_language][download][revision] = 0bbabe6
projects[wetkit_language][download][branch] = 7.x-4.x

projects[wetkit_layouts][version] = 4.x-dev
projects[wetkit_layouts][version] = 4.0-rc1
projects[wetkit_layouts][subdir] = custom
projects[wetkit_layouts][download][type] = git
projects[wetkit_layouts][download][revision] = 3a17eb1
projects[wetkit_layouts][download][branch] = 7.x-4.x

projects[wetkit_menu][version] = 4.x-dev
projects[wetkit_menu][version] = 4.0-rc1
projects[wetkit_menu][subdir] = custom
projects[wetkit_menu][download][type] = git
projects[wetkit_menu][download][revision] = e3533b7
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][revision] = c011e1d
projects[wetkit_metatag][download][branch] = 7.x-4.x

projects[wetkit_migrate][version] = 4.x-dev
projects[wetkit_migrate][version] = 4.0-rc1
projects[wetkit_migrate][subdir] = custom
projects[wetkit_migrate][download][type] = git
projects[wetkit_migrate][download][revision] = d2462c3
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.0
projects[wetkit_pages][subdir] = custom
projects[wetkit_pages][download][type] = git
projects[wetkit_pages][download][revision] = 6bb7d65
projects[wetkit_pages][download][branch] = 7.x-4.x

projects[wetkit_search][version] = 4.x-dev
projects[wetkit_search][version] = 4.0-rc1
projects[wetkit_search][subdir] = custom
projects[wetkit_search][download][type] = git
projects[wetkit_search][download][revision] = f192fd2
projects[wetkit_search][download][branch] = 7.x-4.x

projects[wetkit_test][version] = 4.x-dev
projects[wetkit_test][version] = 4.0
projects[wetkit_test][subdir] = custom
projects[wetkit_test][download][type] = git
projects[wetkit_test][download][revision] = 07df82e
projects[wetkit_test][download][branch] = 7.x-4.x

projects[wetkit_theme][version] = 4.x-dev
projects[wetkit_theme][version] = 4.0-rc1
projects[wetkit_theme][subdir] = custom
projects[wetkit_theme][download][type] = git
projects[wetkit_theme][download][revision] = 721aef5
projects[wetkit_theme][download][branch] = 7.x-4.x

projects[wetkit_users][version] = 4.x-dev
projects[wetkit_users][version] = 4.0
projects[wetkit_users][subdir] = custom
projects[wetkit_users][download][type] = git
projects[wetkit_users][download][revision] = 81f5261
projects[wetkit_users][download][branch] = 7.x-4.x

projects[wetkit_wetboew][version] = 4.x-dev
projects[wetkit_wetboew][version] = 4.0-rc1
projects[wetkit_wetboew][subdir] = custom
projects[wetkit_wetboew][download][type] = git
projects[wetkit_wetboew][download][revision] = 464e161
projects[wetkit_wetboew][download][branch] = 7.x-4.x

projects[wetkit_widgets][version] = 4.x-dev
projects[wetkit_widgets][version] = 4.0
projects[wetkit_widgets][subdir] = custom
projects[wetkit_widgets][download][type] = git
projects[wetkit_widgets][download][revision] = 04b566c
projects[wetkit_widgets][download][branch] = 7.x-4.x

projects[wetkit_wysiwyg][version] = 4.x-dev
projects[wetkit_wysiwyg][version] = 4.0
projects[wetkit_wysiwyg][subdir] = custom
projects[wetkit_wysiwyg][download][type] = git
projects[wetkit_wysiwyg][download][revision] = b19de2f
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][revision] = bd54707
projects[wetkit_ember][download][branch] = 7.x-4.x
projects[wetkit_ember][version] = 4.0
projects[wetkit_ember][type] = theme

projects[wetkit_bootstrap][version] = 4.x-dev
projects[wetkit_bootstrap][download][type] = git
projects[wetkit_bootstrap][download][revision] = 4e5df91
projects[wetkit_bootstrap][download][branch] = 7.x-4.x
projects[wetkit_bootstrap][version] = 4.0-rc1
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

0 comments on commit 750ebd5

Please sign in to comment.