Skip to content

Commit

Permalink
Merge pull request #1700 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 Aug 20, 2015
2 parents 8d8531a + 792a602 commit f940301
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 15 deletions.
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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):
Expand Down Expand Up @@ -760,6 +783,33 @@ Bug Fixes:

<!-- Links Referenced -->

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

[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

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

[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

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

[R4.0-rc2-Commit-0e3f6cf]: http://drupalcode.org/project/wetkit.git/commit/0e3f6cf
Expand Down
2 changes: 1 addition & 1 deletion build-wetkit-dev.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build-wetkit-release.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build-wetkit.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drupal-org-core.make
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions drupal-org-release.make
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc6
projects[wetkit_core][subdir] = custom

projects[wetkit_demo][version] = 4.1
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc6
projects[wetkit_core][subdir] = custom

projects[wetkit_demo][version] = 4.1
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f940301

Please sign in to comment.