Commit a449167f authored by Liam Morland's avatar Liam Morland
Browse files

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

Tag 1.0.1

See merge request !43
parents 431df323 ce7c33b6
...@@ -13,7 +13,7 @@ popup_agreed: ...@@ -13,7 +13,7 @@ popup_agreed:
format: uw_tf_standard format: uw_tf_standard
popup_agree_button_message: 'Accept all' popup_agree_button_message: 'Accept all'
popup_agreed_enabled: false popup_agreed_enabled: false
popup_bg_hex: fdd54f popup_bg_hex: ''
popup_clicking_confirmation: true popup_clicking_confirmation: true
popup_scrolling_confirmation: false popup_scrolling_confirmation: false
popup_delay: 1000 popup_delay: 1000
...@@ -36,7 +36,7 @@ popup_link: '<front>' ...@@ -36,7 +36,7 @@ popup_link: '<front>'
popup_link_new_window: true popup_link_new_window: true
popup_position: false popup_position: false
fixed_top_position: true fixed_top_position: true
popup_text_hex: 000000 popup_text_hex: ''
popup_width: 100% popup_width: 100%
use_bare_css: true use_bare_css: true
disagree_do_not_show_popup: false disagree_do_not_show_popup: false
......
...@@ -3,7 +3,7 @@ activate: false ...@@ -3,7 +3,7 @@ activate: false
mail_attr: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' mail_attr: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'
unique_id: SAM-Account-Name unique_id: SAM-Account-Name
user_name: SAM-Account-Name user_name: SAM-Account-Name
auth_source: uwaterloo-sp auth_source: '*overriden - set in settings.php*'
login_link_show: true login_link_show: true
login_link_display_name: 'uWaterloo ADFS login' login_link_display_name: 'uWaterloo ADFS login'
header_no_cache: false header_no_cache: false
...@@ -12,7 +12,7 @@ role: ...@@ -12,7 +12,7 @@ role:
eval_every_time: true eval_every_time: true
register_users: true register_users: true
allow: allow:
set_drupal_pwd: true set_drupal_pwd: false
default_login: true default_login: true
default_login_roles: { } default_login_roles: { }
default_login_users: '1' default_login_users: '1'
......
mappings: { } mappings:
-
attribute_name: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'
field_name: field_uw_first_name
-
attribute_name: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname'
field_name: field_uw_last_name
interface:
default: php_mail
webform: webform_php_mail
...@@ -161,5 +161,6 @@ dependencies: ...@@ -161,5 +161,6 @@ dependencies:
- drupal:webform_ui - drupal:webform_ui
- drupal:workbench_access - drupal:workbench_access
- drupal:workflows - drupal:workflows
- uw_ws_ofis:uw_ws_ofis
libraries: libraries:
- uw_sites_all/uw-sites-all-adminimal - uw_sites_all/uw-sites-all-adminimal
...@@ -57,3 +57,10 @@ function uw_sites_all_uninstall() { ...@@ -57,3 +57,10 @@ function uw_sites_all_uninstall() {
$query->execute(); $query->execute();
} }
} }
/**
* Enables OFIS module.
*/
function uw_sites_all_update_8101(&$sandbox) {
\Drupal::service('module_installer')->install(['uw_ws_ofis']);
}
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