Merge pull request #1747 from sylus/7.x-4.x

Updates for 4.x branch.

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG.md
 
-## v4.1 (In Development)
+## v4.1
 
 Security Update(s):
 
@@ -17,6 +17,23 @@ Features:
   - Sidebar menu now supports up to 4 levels
 
 Fixes:
+
+  - (Commit: [725b2c2][R4.1-Commit-725b2c2]) Fixed WetKit Deployment for #[2622202][R4.1-Issue-2622202] - wetkit_deployment entity_menu_links PDOException for sqlsrv
+  - (Commit: [263058e][R4.1-Commit-263058e]) Fixed WetKit Deployment for #[2621604][R4.1-Issue-2621604] - admin/dashboard/deployment redirects to home page instead of itself
+  - (Commit: [77ac467][R4.1-Commit-77ac467]) Fixed WetKit Core for #[2619078][R4.1-Issue-2619078] - Tokens: Dropdown arrow for Replacement Patterns not working correctly
+  - (Commit: [5759ff7][R4.1-Commit-5759ff7]) Fixed WetKit Bootstrap for Correct label.
+  - (Commit: [4bd25db][R4.1-Commit-4bd25db]) Fixed WetKit Bootstrap for #[2622216][R4.1-Issue-2622216] - Webforms Inline Label not working ( with CSS fix )
+  - (Commit: [779dd53][R4.1-Commit-779dd53]) Fixed WetKit Core for #[2619268][R4.1-Issue-2619268] - Patch for Views-based search
+  - (Commit: [b2dcea0][R4.1-Commit-b2dcea0]) Fixed WetKit Bootstrap for Override some deploy module css adjustments to deploy layout.
+  - (Commit: [e119bc9][R4.1-Commit-e119bc9]) Fixed WetKit Deployment for #[2621604][R4.1-Issue-2621604] - admin/dashboard/deployment redirects to home page instead of it'self
+  - (Commit: [558fae8][R4.1-Commit-558fae8]) #[2617576][R4.1-Issue-2617576] - Strong tag HTML showing when deleting node
+  - (Commit: [f871102][R4.1-Commit-f871102]) Fixed WetKit Deployment for #[2434461][R4.1-Issue-2434461] - bean workflow (published-deploy, unpublished-nodeploy)
+  - (Commit: [05fb6a6][R4.1-Commit-05fb6a6]) Fixed WetKit Bean for Undefined index wetkit_bean_link $settings.
+  - (Commit: [8faaf9b][R4.1-Commit-8faaf9b]) Fixed WetKit Webform for #[2617408][R4.1-Issue-2617408] - Update webform to 4.12 version
+  - (Commit: [de7f6d8][R4.1-Commit-de7f6d8]) Fixed WetKit Widgets for #[2357309][R4.1-Issue-2357309] - JS error when pasting HTML code into a WYSIWYG textarea
+  - (Commit: [696a311][R4.1-Commit-696a311]) Addition of wetkit_webform module.
+  - (Commit: [7a54af8][R4.1-Commit-7a54af8]) Fixed WetKit Menu for #[2485817][R4.1-Issue-2485817] - sidebar menu 4 levels deep in 4.x
+  - (Commit: [c7e13ce][R4.1-Commit-c7e13ce]) Update changelog.md file.
   - (Commit: [05aa4d8][R4.1-Commit-05aa4d8]) Fixed WetKit Bean for Add none to share widget grid columns.
   - (Commit: [f393fbd][R4.1-Commit-f393fbd]) Fixed WetKit Menu for #[2485817][R4.1-Issue-2485817] - sidebar menu 4 levels deep in 4.x
   - (Commit: [a68fce4][R4.1-Commit-a68fce4]) Fixed WetKit Core for Patch for fontawesome favoring status report messaging.
@@ -915,6 +932,22 @@ Bug Fixes:
 
 <!-- Commits R4.1 -->
 
+[R4.1-Commit-725b2c2]: http://drupalcode.org/project/wetkit.git/commit/725b2c2
+[R4.1-Commit-263058e]: http://drupalcode.org/project/wetkit.git/commit/263058e
+[R4.1-Commit-77ac467]: http://drupalcode.org/project/wetkit.git/commit/77ac467
+[R4.1-Commit-5759ff7]: http://drupalcode.org/project/wetkit.git/commit/5759ff7
+[R4.1-Commit-4bd25db]: http://drupalcode.org/project/wetkit.git/commit/4bd25db
+[R4.1-Commit-779dd53]: http://drupalcode.org/project/wetkit.git/commit/779dd53
+[R4.1-Commit-b2dcea0]: http://drupalcode.org/project/wetkit.git/commit/b2dcea0
+[R4.1-Commit-e119bc9]: http://drupalcode.org/project/wetkit.git/commit/e119bc9
+[R4.1-Commit-558fae8]: http://drupalcode.org/project/wetkit.git/commit/558fae8
+[R4.1-Commit-f871102]: http://drupalcode.org/project/wetkit.git/commit/f871102
+[R4.1-Commit-05fb6a6]: http://drupalcode.org/project/wetkit.git/commit/05fb6a6
+[R4.1-Commit-8faaf9b]: http://drupalcode.org/project/wetkit.git/commit/8faaf9b
+[R4.1-Commit-de7f6d8]: http://drupalcode.org/project/wetkit.git/commit/de7f6d8
+[R4.1-Commit-696a311]: http://drupalcode.org/project/wetkit.git/commit/696a311
+[R4.1-Commit-7a54af8]: http://drupalcode.org/project/wetkit.git/commit/7a54af8
+[R4.1-Commit-c7e13ce]: http://drupalcode.org/project/wetkit.git/commit/c7e13ce
 [R4.1-Commit-05aa4d8]: http://drupalcode.org/project/wetkit.git/commit/05aa4d8
 [R4.1-Commit-f393fbd]: http://drupalcode.org/project/wetkit.git/commit/f393fbd
 [R4.1-Commit-a68fce4]: http://drupalcode.org/project/wetkit.git/commit/a68fce4
@@ -952,6 +985,17 @@ Bug Fixes:
 
 <!-- Issues R4.1 -->
 
+[R4.1-Issue-2622202]: http://drupal.org/node/2622202
+[R4.1-Issue-2621604]: http://drupal.org/node/2621604
+[R4.1-Issue-2619078]: http://drupal.org/node/2619078
+[R4.1-Issue-2622216]: http://drupal.org/node/2622216
+[R4.1-Issue-2619268]: http://drupal.org/node/2619268
+[R4.1-Issue-2621604]: http://drupal.org/node/2621604
+[R4.1-Issue-2617576]: http://drupal.org/node/2617576
+[R4.1-Issue-2434461]: http://drupal.org/node/2434461
+[R4.1-Issue-2617408]: http://drupal.org/node/2617408
+[R4.1-Issue-2357309]: http://drupal.org/node/2357309
+[R4.1-Issue-2485817]: http://drupal.org/node/2485817
 [R4.1-Issue-2485817]: http://drupal.org/node/2485817
 [R4.1-Issue-2485817]: http://drupal.org/node/2485817
 [R4.1-Issue-2615858]: http://drupal.org/node/2615858

drupal-org-release.make

@@ -3,37 +3,37 @@ core = 7.x
 
 ; WxT Foundation (Custom)
 
-projects[wetkit_admin][version] = 4.0
+projects[wetkit_admin][version] = 4.1
 projects[wetkit_admin][subdir] = custom
 
-projects[wetkit_bean][version] = 4.0
+projects[wetkit_bean][version] = 4.1
 projects[wetkit_bean][subdir] = custom
 
 projects[wetkit_breadcrumbs][version] = 4.2
 projects[wetkit_breadcrumbs][subdir] = custom
 
-projects[wetkit_core][version] = 4.0
+projects[wetkit_core][version] = 4.1
 projects[wetkit_core][subdir] = custom
 
 projects[wetkit_demo][version] = 4.1
 projects[wetkit_demo][subdir] = custom
 
-projects[wetkit_deployment][version] = 4.2
+projects[wetkit_deployment][version] = 4.3
 projects[wetkit_deployment][subdir] = custom
 
-projects[wetkit_images][version] = 4.2
+projects[wetkit_images][version] = 4.3
 projects[wetkit_images][subdir] = custom
 
-projects[wetkit_language][version] = 4.0
+projects[wetkit_language][version] = 4.1
 projects[wetkit_language][subdir] = custom
 
-projects[wetkit_layouts][version] = 4.0
+projects[wetkit_layouts][version] = 4.1
 projects[wetkit_layouts][subdir] = custom
 
-projects[wetkit_menu][version] = 4.0
+projects[wetkit_menu][version] = 4.1
 projects[wetkit_menu][subdir] = custom
 
-projects[wetkit_metatag][version] = 4.1
+projects[wetkit_metatag][version] = 4.2
 projects[wetkit_metatag][subdir] = custom
 
 projects[wetkit_migrate][version] = 4.0
@@ -42,13 +42,13 @@ projects[wetkit_migrate][subdir] = custom
 projects[wetkit_og][version] = 4.0
 projects[wetkit_og][subdir] = custom
 
-projects[wetkit_pages][version] = 4.1
+projects[wetkit_pages][version] = 4.2
 projects[wetkit_pages][subdir] = custom
 
 projects[wetkit_search][version] = 4.0
 projects[wetkit_search][subdir] = custom
 
-projects[wetkit_test][version] = 4.2
+projects[wetkit_test][version] = 4.3
 projects[wetkit_test][subdir] = custom
 
 projects[wetkit_theme][version] = 4.0
@@ -57,10 +57,13 @@ projects[wetkit_theme][subdir] = custom
 projects[wetkit_users][version] = 4.1
 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][subdir] = custom
 
-projects[wetkit_widgets][version] = 4.2
+projects[wetkit_widgets][version] = 4.3
 projects[wetkit_widgets][subdir] = custom
 
 projects[wetkit_wysiwyg][version] = 4.2
@@ -71,7 +74,7 @@ projects[wetkit_wysiwyg][subdir] = custom
 projects[wetkit_ember][version] = 4.2
 projects[wetkit_ember][type] = theme
 
-projects[wetkit_bootstrap][version] = 4.0
+projects[wetkit_bootstrap][version] = 4.1
 projects[wetkit_bootstrap][type] = theme
 
 projects[wetkit_shiny][version] = 4.0

drupal-org.make

@@ -3,140 +3,79 @@ core = 7.x
 
 ; WxT Foundation (Custom)
 
-projects[wetkit_admin][version] = 4.x-dev
+projects[wetkit_admin][version] = 4.1
 projects[wetkit_admin][subdir] = custom
-projects[wetkit_admin][download][type] = git
-projects[wetkit_admin][download][revision] = a475fbf
-projects[wetkit_admin][download][branch] = 7.x-4.x
 
-projects[wetkit_bean][version] = 4.x-dev
+projects[wetkit_bean][version] = 4.1
 projects[wetkit_bean][subdir] = custom
-projects[wetkit_bean][download][type] = git
-projects[wetkit_bean][download][revision] = 486057f
-projects[wetkit_bean][download][branch] = 7.x-4.x
 
-projects[wetkit_breadcrumbs][version] = 4.x-dev
+projects[wetkit_breadcrumbs][version] = 4.2
 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.1
 projects[wetkit_core][subdir] = custom
-projects[wetkit_core][download][type] = git
-projects[wetkit_core][download][revision] = 4422078
-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.3
 projects[wetkit_deployment][subdir] = custom
-projects[wetkit_deployment][download][type] = git
-projects[wetkit_deployment][download][revision] = 6a78658
-projects[wetkit_deployment][download][branch] = 7.x-4.x
 
-projects[wetkit_images][version] = 4.x-dev
+projects[wetkit_images][version] = 4.3
 projects[wetkit_images][subdir] = custom
-projects[wetkit_images][download][type] = git
-projects[wetkit_images][download][revision] = c1d9585
-projects[wetkit_images][download][branch] = 7.x-4.x
 
-projects[wetkit_language][version] = 4.x-dev
+projects[wetkit_language][version] = 4.1
 projects[wetkit_language][subdir] = custom
-projects[wetkit_language][download][type] = git
-projects[wetkit_language][download][revision] = fafe225
-projects[wetkit_language][download][branch] = 7.x-4.x
 
-projects[wetkit_layouts][version] = 4.x-dev
+projects[wetkit_layouts][version] = 4.1
 projects[wetkit_layouts][subdir] = custom
-projects[wetkit_layouts][download][type] = git
-projects[wetkit_layouts][download][revision] = 471b25d
-projects[wetkit_layouts][download][branch] = 7.x-4.x
 
-projects[wetkit_menu][version] = 4.x-dev
+projects[wetkit_menu][version] = 4.1
 projects[wetkit_menu][subdir] = custom
-projects[wetkit_menu][download][type] = git
-projects[wetkit_menu][download][revision] = 1d07c86
-projects[wetkit_menu][download][branch] = 7.x-4.x
 
-projects[wetkit_metatag][version] = 4.x-dev
+projects[wetkit_metatag][version] = 4.2
 projects[wetkit_metatag][subdir] = custom
-projects[wetkit_metatag][download][type] = git
-projects[wetkit_metatag][download][revision] = 6df1ffb
-projects[wetkit_metatag][download][branch] = 7.x-4.x
 
-projects[wetkit_migrate][version] = 4.x-dev
+projects[wetkit_migrate][version] = 4.0
 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.2
 projects[wetkit_pages][subdir] = custom
-projects[wetkit_pages][download][type] = git
-projects[wetkit_pages][download][revision] = a7f27ad
-projects[wetkit_pages][download][branch] = 7.x-4.x
 
-projects[wetkit_search][version] = 4.x-dev
+projects[wetkit_search][version] = 4.0
 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.x-dev
+projects[wetkit_test][version] = 4.3
 projects[wetkit_test][subdir] = custom
-projects[wetkit_test][download][type] = git
-projects[wetkit_test][download][revision] = dd562c3
-projects[wetkit_test][download][branch] = 7.x-4.x
 
-projects[wetkit_theme][version] = 4.x-dev
+projects[wetkit_theme][version] = 4.0
 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_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][revision] = cd57aec
-projects[wetkit_webform][download][branch] = 7.x-4.x
 
-projects[wetkit_wetboew][version] = 4.x-dev
+projects[wetkit_wetboew][version] = 4.0
 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.3
 projects[wetkit_widgets][subdir] = custom
-projects[wetkit_widgets][download][type] = git
-projects[wetkit_widgets][download][revision] = cfd97a3
-projects[wetkit_widgets][download][branch] = 7.x-4.x
 
-projects[wetkit_wysiwyg][version] = 4.x-dev
+projects[wetkit_wysiwyg][version] = 4.2
 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.2
+projects[wetkit_ember][type] = theme
 
-projects[wetkit_bootstrap][version] = 4.x-dev
-projects[wetkit_bootstrap][download][type] = git
-projects[wetkit_bootstrap][download][revision] = 7d7eb5d
-projects[wetkit_bootstrap][download][branch] = 7.x-4.x
+projects[wetkit_bootstrap][version] = 4.1
+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