Skip to content

Commit

Permalink
Merge branch '8.x-3.x-updates' into 8.x-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Brant Wynn committed Nov 13, 2018
2 parents eac6247 + 5876446 commit c320b29
Show file tree
Hide file tree
Showing 11 changed files with 2,807 additions and 5,820 deletions.
34 changes: 14 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@
"Data-align center does not work | https://www.drupal.org/node/2645458": "https://www.drupal.org/files/issues/2018-09-28/data-align-2645458-61_0.patch"
},
"drupal/facets": {
"facets_range_widget: 'TypeError: r.toFixed() is not a function' | https://www.drupal.org/project/facets/issues/2922151": "https://www.drupal.org/files/issues/facets_range_widget_js_error_toFixed_is_not_a_function-2922151-2.patch"
"Fatal error after upgrade to beta-2 | https://www.drupal.org/node/2938089": "https://www.drupal.org/files/issues/2938089-1.patch",
"facets_range_widget: 'TypeError: r.toFixed() is not a function' | https://www.drupal.org/project/facets/issues/2922151": "https://www.drupal.org/files/issues/facets_range_widget_js_error_toFixed_is_not_a_function-2922151-2.patch",
"Update jquery.ui.slider.pips JS/CSS paths | https://www.drupal.org/node/2943636": "https://www.drupal.org/files/issues/update-facets-range-widget-library-paths-2943636-2.patch"
},
"drupal/material_admin": {
"Add Color module integration | https://www.drupal.org/node/3000991": "https://www.drupal.org/files/issues/2018-09-19/add-color-module-3000991-2.patch",
Expand All @@ -168,10 +170,6 @@
"Update devices | https://www.drupal.org/node/3011828": "https://www.drupal.org/files/issues/2018-11-06/update-devices-3011828-2.patch"

},
"drupal/rules": {
"PHP Fatal error when adding an action and address is installed | http://drupal.org/node/2694685": "https://www.drupal.org/files/issues/rules-Fix_type_definition_error-2694685-30.patch",
"Data processors do not check type before performing type-specific operations | https://www.drupal.org/node/2849810": "https://www.drupal.org/files/issues/rules-data-processor-type-checking.patch"
},
"drupal/zurb_foundation": {
"Upgrade from layout plugin to Layout API / Layout discovery | https://www.drupal.org/node/2871479": "https://www.drupal.org/files/issues/accommodate-layout-changes-2871479-3.patch"
},
Expand All @@ -188,17 +186,16 @@
}
},
"require": {
"acquia/lightning": "3.2.0",
"acquia/lightning": "3.2.2",
"acquia/content-hub-php": "1.3.1",
"acquia/lift-sdk-php": "dev-master",
"bower-asset/jquery-ui-slider-pips": "1.11.3",
"bower-asset/leaflet": "1.0.3",
"bower-asset/masonry": "4.2.0",
"bower-asset/slick-carousel": "1.7.1",
"npm-asset/fontawesome-iconpicker": "1.3.0",
"npm-asset/imagesloaded": "4.1.1",
"drupal/acquia_contenthub": "1.31.0",
"drupal/acquia_lift": "3.9.0",
"drupal/acquia_contenthub": "1.32.0",
"drupal/acquia_lift": "3.10.0",
"drupal/acsf": "1.48.0",
"drupal/address": "1.4.0",
"drupal/addtoany": "1.10.0",
Expand All @@ -216,25 +213,23 @@
"drupal/config_tools": "1.x-dev",
"drupal/content_browser": "1.0.0-alpha4",
"drupal/custom_body_class": "1.2.0",
"drupal/entity_browser": "2.0.0-alpha2",
"drupal/entity_browser_block": "1.x-dev",
"drupal/entity_gallery": "1.x-dev",
"drupal/entity_usage": "2.0.0-alpha2",
"drupal/eu_cookie_compliance": "1.2.0",
"drupal/facets": "1.1.0",
"drupal/facets": "1.0.0-beta2",
"drupal/field_formatter_class": "1.1.0",
"drupal/field_group": "3.0-beta1",
"drupal/fontyourface": "3.2",
"drupal/focal_point": "1.0-beta6",
"drupal/geocoder": "2.0.0-beta3",
"drupal/geofield": "1.0.0-beta4",
"drupal/geocoder": "2.0.0-beta7",
"drupal/geofield": "1.0.0-beta5",
"drupal/geophp": "1.x-dev#cb7b8c6b8465e3af41f8f6f8b43c7057c4ca9128",
"drupal/geolocation": "1.x-dev#e4639b9da6c963d9fb802b822bbdeebaa0853b4d",
"drupal/google_analytics": "2.3.0",
"drupal/image_effects": "1.1.0",
"drupal/import": "2.0.0-beta2",
"drupal/leaflet": "1.x-dev#f8205538099a6e2d01f99bd62cc91094a2c6adc5",
"drupal/libraries": "3.x-dev",
"drupal/link_class": "1.3.0",
"drupal/ip_anon": "1.2",
"drupal/lite": "1.4.0",
Expand All @@ -243,9 +238,8 @@
"drupal/material_admin_support": "1.x-dev",
"drupal/media_acquiadam": "1.32.0",
"drupal/media_entity_video": "2.0.0-alpha1",
"drupal/message": "1.0.0-rc1",
"drupal/message": "1.0.0-rc2",
"drupal/message_notify": "1.0.0-beta1",
"drupal/moderation_dashboard": "1.x-dev",
"drupal/moderation_note": "1.0-beta1",
"drupal/migrate_plus": "4.0.0",
"drupal/migrate_source_csv": "2.0.0",
Expand All @@ -258,17 +252,17 @@
"drupal/responsive_preview": "1.0.0-alpha7",
"drupal/restui": "1.15.0",
"drupal/revision_log_default": "1.0.0",
"drupal/rules": "3.0.0-alpha3",
"drupal/rules": "3.0.0-alpha4",
"drupal/samlauth": "2.0.0-alpha1",
"drupal/search_api_autocomplete": "1.0.0",
"drupal/search_api_autocomplete": "1.1.0",
"drupal/search_api_solr": "1.2.0",
"drupal/scenarios": "3.x-dev",
"drupal/swiftmailer": "1.0.0-beta1",
"drupal/swiftmailer": "1.0.0-beta2",
"drupal/type_style": "1.x-dev",
"drupal/view_modes_display": "1.0.0",
"drupal/webform": "5.0.0-rc24",
"drupal/webform_views": "5.0.0-alpha5",
"drupal/workbench_email": "1.0-rc2",
"drupal/workbench_email": "1.0-rc3",
"drupal/zurb_foundation": "6.0.0-alpha4",
"drupal-composer/drupal-scaffold": "^2.0.0",
"cweagans/composer-patches": "1.x-dev as 1.6.5",
Expand Down
Loading

0 comments on commit c320b29

Please sign in to comment.