Commit 8dc02473 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents cf84a37a cd1b38e5
...@@ -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: '*overriden - set in settings.php*' auth_source: '*overridden - 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
...@@ -14,9 +14,15 @@ register_users: true ...@@ -14,9 +14,15 @@ register_users: true
allow: allow:
set_drupal_pwd: false set_drupal_pwd: false
default_login: true default_login: true
default_login_roles: { } default_login_roles:
uw_role_site_owner: uw_role_site_owner
uw_role_site_manager: uw_role_site_manager
uw_role_content_editor: uw_role_content_editor
uw_role_content_author: uw_role_content_author
uw_role_form_editor: uw_role_form_editor
uw_role_form_results_access: uw_role_form_results_access
default_login_users: '1' default_login_users: '1'
logout_goto_url: null logout_goto_url: ''
user_register_original: visitors user_register_original: visitors
sync: sync:
mail: true mail: true
......
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