Commit 3af59186 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents 8f27c30e 8992e0fa
settings: settings:
default_status: open default_status: open
default_page_base_path: form default_page_base_path: /form
default_ajax: false default_ajax: false
default_ajax_effect: fade default_ajax_effect: fade
default_ajax_speed: 500 default_ajax_speed: 500
...@@ -17,6 +17,7 @@ settings: ...@@ -17,6 +17,7 @@ settings:
default_form_disable_back: false default_form_disable_back: false
default_form_submit_back: false default_form_submit_back: false
default_form_unsaved: false default_form_unsaved: false
default_form_disable_remote_addr: false
default_form_novalidate: false default_form_novalidate: false
default_form_disable_inline_errors: false default_form_disable_inline_errors: false
default_form_required: false default_form_required: false
...@@ -232,6 +233,7 @@ libraries: ...@@ -232,6 +233,7 @@ libraries:
- jquery.timepicker - jquery.timepicker
- progress-tracker - progress-tracker
- signature_pad - signature_pad
- tippyjs/5.x
requirements: requirements:
cdn: true cdn: true
bootstrap: true bootstrap: true
......
...@@ -16,6 +16,7 @@ dependencies: ...@@ -16,6 +16,7 @@ dependencies:
- 'drupal:ckeditor' - 'drupal:ckeditor'
- 'drupal:comment' - 'drupal:comment'
- 'drupal:components' - 'drupal:components'
- 'drupal:composer_deploy'
- 'drupal:config' - 'drupal:config'
- 'drupal:contact' - 'drupal:contact'
- 'drupal:content_moderation' - 'drupal:content_moderation'
......
...@@ -289,3 +289,22 @@ function uw_sites_all_update_8108(&$sandbox) { ...@@ -289,3 +289,22 @@ function uw_sites_all_update_8108(&$sandbox) {
} }
} }
/**
* Install composer_deploy.
*/
function uw_sites_all_update_8109() {
// Modules to install.
$modules = [
'composer_deploy',
];
\Drupal::service('module_installer')->install($modules);
}
/**
* Re-run webform_update_8131().
*/
function uw_sites_all_update_8110() {
module_load_include('install', 'webform');
webform_update_8131();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment