Commit 61620ee7 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 740e3058 b8edaac6
......@@ -37,3 +37,10 @@ policy_constraints:
disallow_username: true
roles:
authenticated: authenticated
uw_role_site_owner: uw_role_site_owner
uw_role_site_manager: uw_role_site_manager
uw_role_content_author: uw_role_content_author
uw_role_content_editor: uw_role_content_editor
uw_role_form_editor: uw_role_form_editor
uw_role_form_results_access: uw_role_form_results_access
uw_role_private_content_viewer: uw_role_private_content_viewer
role_expire_default_roles: '{"administrator":"0","uw_role_site_owner":"0","uw_role_site_manager":"0","uw_role_content_author":"0","uw_role_content_editor":"0","uw_role_form_editor":"0","uw_role_form_results_access":"0"}'
role_expire_disabled_roles: '{"administrator":0,"uw_role_site_owner":0,"uw_role_site_manager":0,"uw_role_content_author":0,"uw_role_content_editor":0,"uw_role_form_editor":0,"uw_role_form_results_access":0}'
role_expire_default_roles: '{"administrator":"0","uw_role_site_owner":"0","uw_role_site_manager":"0","uw_role_content_author":"0","uw_role_content_editor":"0","uw_role_form_editor":"0","uw_role_form_results_access":"0","uw_role_private_content_viewer":"0"}'
role_expire_disabled_roles: '{"administrator":0,"uw_role_site_owner":0,"uw_role_site_manager":0,"uw_role_content_author":0,"uw_role_content_editor":0,"uw_role_form_editor":0,"uw_role_form_results_access":0,"uw_role_private_content_viewer":0}'
role_expire_default_duration_roles: { }
......@@ -21,6 +21,7 @@ allow:
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
uw_role_private_content_viewer: uw_role_private_content_viewer
default_login_users: '1'
logout_goto_url: ''
user_register_original: visitors
......
......@@ -77,6 +77,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: created
granularity: second
entity_type: node
entity_field: created
......
......@@ -254,6 +254,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: changed
granularity: second
entity_type: node
entity_field: changed
......
......@@ -203,6 +203,7 @@ display:
admin_label: ''
expose:
label: ''
field_identifier: sticky
exposed: false
field: sticky
group_type: group
......@@ -225,6 +226,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: created
granularity: second
entity_type: node
entity_field: created
......
......@@ -77,6 +77,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: sticky
created:
id: created
table: taxonomy_index
......@@ -89,6 +90,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: created
granularity: second
arguments:
tid:
......
......@@ -848,6 +848,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: created
granularity: second
plugin_id: date
entity_type: user
......
......@@ -641,7 +641,12 @@ display:
exclude: false
alter:
alter_text: true
text: "<ul>\n <li>{{ nothing }}</li>\n <li>{{ nothing_1}}</li>\n <li>{{ nothing_2}}</li>\n</ul>"
text: |-
<ul>
<li>{{ nothing }}</li>
<li>{{ nothing_1}}</li>
<li>{{ nothing_2}}</li>
</ul>
make_link: false
path: ''
absolute: false
......
......@@ -323,6 +323,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: timestamp
granularity: second
entity_type: aggregator_item
entity_field: timestamp
......
......@@ -788,6 +788,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: changed
granularity: second
entity_type: node
entity_field: changed
......
......@@ -156,6 +156,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: created
granularity: second
plugin_id: date
entity_type: user
......
......@@ -165,6 +165,7 @@ display:
exposed: false
expose:
label: ''
field_identifier: access
granularity: second
plugin_id: date
entity_type: user
......
......@@ -143,9 +143,28 @@ element:
machine_name_pattern: a-z0-9_
empty_message: '{Empty}'
allowed_tags: admin
wrapper_classes: "container-inline clearfix\nform--inline clearfix\nmessages messages--error\nmessages messages--warning\nmessages messages--status\n"
classes: "container-inline clearfix\nform--inline clearfix\nmessages messages--error\nmessages messages--warning\nmessages messages--status\n"
horizontal_rule_classes: "webform-horizontal-rule--solid\nwebform-horizontal-rule--dashed\nwebform-horizontal-rule--dotted\nwebform-horizontal-rule--gradient\nwebform-horizontal-rule--thin\nwebform-horizontal-rule--medium\nwebform-horizontal-rule--thick\nwebform-horizontal-rule--flaired\nwebform-horizontal-rule--glyph\n"
wrapper_classes: |
container-inline clearfix
form--inline clearfix
messages messages--error
messages messages--warning
messages messages--status
classes: |
container-inline clearfix
form--inline clearfix
messages messages--error
messages messages--warning
messages messages--status
horizontal_rule_classes: |
webform-horizontal-rule--solid
webform-horizontal-rule--dashed
webform-horizontal-rule--dotted
webform-horizontal-rule--gradient
webform-horizontal-rule--thin
webform-horizontal-rule--medium
webform-horizontal-rule--thick
webform-horizontal-rule--flaired
webform-horizontal-rule--glyph
default_description_display: ''
default_more_title: More
default_section_title_tag: h2
......@@ -197,12 +216,98 @@ mail:
default_sender_mail: ''
default_sender_name: ''
default_subject: 'Webform submission from: [webform_submission:source-entity]'
default_body_text: "Submitted on [webform_submission:created]\nSubmitted by: [webform_submission:user]\n\nSubmitted values are:\n[webform_submission:values]\n"
default_body_html: "<p>Submitted on [webform_submission:created]</p>\n<p>Submitted by: [webform_submission:user]</p>\n<p>Submitted values are:</p>\n[webform_submission:values]\n"
default_body_text: |
Submitted on [webform_submission:created]
Submitted by: [webform_submission:user]
Submitted values are:
[webform_submission:values]
default_body_html: |
<p>Submitted on [webform_submission:created]</p>
<p>Submitted by: [webform_submission:user]</p>
<p>Submitted values are:</p>
[webform_submission:values]
roles: { }
test:
types: "checkbox:\n - true\ncolor:\n - '#ffffcc'\n - '#ffffcc'\n - '#ccffff'\nemail:\n - 'example@example.com'\n - 'test@test.com'\n - 'random@random.com'\nlanguage_select:\n - en\nmachine_name:\n - 'loremipsum'\n - 'oratione'\n - 'dixisset'\ntel:\n - '123-456-7890'\n - '098-765-4321'\ntextarea:\n - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.'\n - 'Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;'\n - 'Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.'\ntext_format:\n - value: '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.</p>'\n - value: '<p>Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;</p>'\n - value: '<p>Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.</p>'\nurl:\n - 'http://example.com'\n - 'http://test.com'\nwebform_email_confirm:\n - 'example@example.com'\n - 'test@test.com'\n - 'random@random.com'\nwebform_email_multiple:\n - 'example@example.com, test@test.com, random@random.com'\nwebform_location:\n - value: 'The White House, 1600 Pennsylvania Ave NW, Washington, DC 20500, USA'\n - value: 'London SW1A 1AA, United Kingdom'\n - value: 'Moscow, Russia, 10307'\nwebform_time:\n - '09:00'\n - '17:00'\n"
names: "first_name:\n - 'John'\n - 'Paul'\n - 'Ringo'\n - 'George'\nlast_name:\n - 'Lennon'\n - 'McCartney'\n - 'Starr'\n - 'Harrison'\naddress:\n - '10 Main Street'\n - '11 Brook Alley Road. APT 1'\nzip:\n - '11111'\n - '12345'\n - '12345-6789'\nphone:\n - '123-456-7890'\n - '098-765-4321'\nfax:\n - '123-456-7890'\n - '098-765-4321'\ncity:\n - 'Springfield'\n - 'Pleasantville'\n - 'Hill Valley'\nurl:\n - 'http://example.com'\n - 'http://test.com'\ndefault:\n - 'Loremipsum'\n - 'Oratione'\n - 'Dixisset'\n"
types: |
checkbox:
- true
color:
- '#ffffcc'
- '#ffffcc'
- '#ccffff'
email:
- 'example@example.com'
- 'test@test.com'
- 'random@random.com'
language_select:
- en
machine_name:
- 'loremipsum'
- 'oratione'
- 'dixisset'
tel:
- '123-456-7890'
- '098-765-4321'
textarea:
- 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.'
- 'Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;'
- 'Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.'
text_format:
- value: '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.</p>'
- value: '<p>Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;</p>'
- value: '<p>Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.</p>'
url:
- 'http://example.com'
- 'http://test.com'
webform_email_confirm:
- 'example@example.com'
- 'test@test.com'
- 'random@random.com'
webform_email_multiple:
- 'example@example.com, test@test.com, random@random.com'
webform_location:
- value: 'The White House, 1600 Pennsylvania Ave NW, Washington, DC 20500, USA'
- value: 'London SW1A 1AA, United Kingdom'
- value: 'Moscow, Russia, 10307'
webform_time:
- '09:00'
- '17:00'
names: |
first_name:
- 'John'
- 'Paul'
- 'Ringo'
- 'George'
last_name:
- 'Lennon'
- 'McCartney'
- 'Starr'
- 'Harrison'
address:
- '10 Main Street'
- '11 Brook Alley Road. APT 1'
zip:
- '11111'
- '12345'
- '12345-6789'
phone:
- '123-456-7890'
- '098-765-4321'
fax:
- '123-456-7890'
- '098-765-4321'
city:
- 'Springfield'
- 'Pleasantville'
- 'Hill Valley'
url:
- 'http://example.com'
- 'http://test.com'
default:
- 'Loremipsum'
- 'Oratione'
- 'Dixisset'
ui:
video_display: hidden
details_save: true
......
......@@ -84,6 +84,7 @@ dependencies:
- 'drupal:node'
- 'drupal:node_revision_delete'
- 'drupal:office_hours'
- 'drupal:office_hours_exceptions'
- 'drupal:options'
- 'drupal:page_cache'
- 'drupal:paragraphs'
......@@ -103,6 +104,7 @@ dependencies:
- 'drupal:roleassign'
- 'drupal:schema_article'
- 'drupal:schema_event'
- 'drupal:schema_job_posting'
- 'drupal:schema_metatag'
- 'drupal:schema_organization'
- 'drupal:schema_person'
......@@ -118,6 +120,7 @@ dependencies:
- 'drupal:svg_image'
- 'drupal:system'
- 'drupal:taxonomy'
- 'drupal:taxonomy_term_locks'
- 'drupal:telephone'
- 'drupal:text'
- 'drupal:token'
......
......@@ -542,3 +542,30 @@ function uw_sites_all_update_9105(&$sandbox) {
$roles['uw_role_content_editor']->save();
$roles['uw_role_content_author']->save();
}
/**
* Removes uw dashboard configuration for allowed blocks.
*/
function uw_sites_all_update_9106(&$sandbox) {
\Drupal::configFactory()->getEditable('uw_dashboard.allowed_blocks')->delete();
}
/**
* Enables office_hours_exceptions module.
*/
function uw_sites_all_update_9107(&$sandbox) {
$modules = [
'office_hours_exceptions',
];
\Drupal::service('module_installer')->install($modules);
}
/**
* Enables taxonomy_term_locks module.
*/
function uw_sites_all_update_9108(&$sandbox) {
$modules = [
'taxonomy_term_locks',
];
\Drupal::service('module_installer')->install($modules);
}
Supports Markdown
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