Skip to content

Commit

Permalink
Merge pull request #3425 from CityOfBoston/master
Browse files Browse the repository at this point in the history
(production) Metrolist, Feedback Form, Icon Manifest, Theme and config_split updates
  • Loading branch information
davidrkupton authored Apr 22, 2024
2 parents 0d39c50 + fc88471 commit afc063b
Show file tree
Hide file tree
Showing 72 changed files with 770 additions and 350 deletions.
13 changes: 4 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@
"drupal/ckeditor": "1.0.2",
"drupal/coder": "^8.0",
"drupal/colorbox": "^2.0",
"drupal/config_ignore": "^2.1",
"drupal/config_ignore": "^3.2",
"drupal/config_split": "^2.0@RC",
"drupal/config_update": "^2.0@alpha",
"drupal/config_filter": "*",
"drupal/conflict": "2.0.0-alpha3",
"drupal/contact_storage": "1.3.0",
"drupal/content_access": "^2.0@RC",
Expand Down Expand Up @@ -157,7 +158,7 @@
"drupal/panels": "4.7.0",
"drupal/paragraphs": "^1.15",
"drupal/paragraphs_browser": "^1.1",
"drupal/paragraphs_edit": "^2.0",
"drupal/paragraphs_edit": "^3.0",
"drupal/pathauto": "^1.2",
"drupal/poll": "^1.2",
"drupal/profile": "^1.0",
Expand All @@ -183,7 +184,7 @@
"drupal/slick_entityreference": "2.1.0",
"drupal/smart_trim": "^2.1",
"drupal/social_media": "^2.0",
"drupal/sophron": "^1.2",
"drupal/sophron": "^2.0",
"drupal/stage_file_proxy": "^2.1",
"drupal/svg_image": "^3.0",
"drupal/token": "^1.3",
Expand Down Expand Up @@ -317,9 +318,6 @@
"drupal/media_entity_browser": {
"CoB patch - Skip confirmation step": "./patches/media_entity_browser__skip_confirmation.patch"
},
"drupal/config_ignore": {
"CoB patch - Improve config_filter pattern recognition du 03/2022": "./patches/config_filter_match_node_implement_or_logic.patch"
},
"drupal/date_recur": {
"CoB patch - Add helper for exdate retreival": "patches/exdate_helper.patch",
"CoB patch - Make filter work without exposed input": "patches/makeFilterWorkWithoutExposedInput.patch",
Expand Down Expand Up @@ -347,9 +345,6 @@
"drupal/panels": {
"2878684 - Use String.match to correlate regions when switching Layouts in Panels IPE": "https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch"
},
"drupal/salesforce": {
"Fixes salesforce OAUTH error - DU April 2024 https://www.drupal.org/project/salesforce/issues/3427760": "https://www.drupal.org/files/issues/2024-03-14/3427760-2.patch"
},
"drupal/lightning_workflow": {
"COB Patch: Deprecated drupal_get_path for seven theme - DIG-3336: DU Oct 2023": "patches/lightning_scheduler.patch"
},
Expand Down
95 changes: 52 additions & 43 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions config/acquia_prod/config_split.patch.system.performance.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
adding:
css:
preprocess: true
js:
preprocess: true
removing:
css:
preprocess: false
js:
preprocess: false
10 changes: 10 additions & 0 deletions config/acquia_stage/config_split.patch.system.performance.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
adding:
css:
preprocess: true
js:
preprocess: true
removing:
css:
preprocess: false
js:
preprocess: false
2 changes: 1 addition & 1 deletion config/default/block.block.bos_theme_feedbackform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
id: bos_theme_feedbackform
theme: bos_theme
region: content
weight: 10
weight: 8
provider: null
plugin: feedback_form
settings:
Expand Down
3 changes: 2 additions & 1 deletion config/default/block.block.ml_listing_entry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
id: ml_listing_entry
theme: bos_theme
region: content
weight: -1
weight: 1
provider: null
plugin: webform_block
settings:
Expand All @@ -23,6 +23,7 @@ settings:
webform_id: metrolist_listing_entry_form
default_data: ''
redirect: false
lazy: false
visibility:
request_path:
id: request_path
Expand Down
3 changes: 2 additions & 1 deletion config/default/block.block.webform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
id: webform
theme: bos_theme
region: content
weight: 0
weight: 2
provider: null
plugin: webform_block
settings:
Expand All @@ -23,6 +23,7 @@ settings:
webform_id: metrolist_launch_feedback
default_data: ''
redirect: false
lazy: false
visibility:
request_path:
id: request_path
Expand Down
2 changes: 1 addition & 1 deletion config/default/block.block.website_feedback_form.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
id: website_feedback_form
theme: bos_theme
region: content
weight: 1
weight: 10
provider: null
plugin: webform_block
settings:
Expand Down
Loading

0 comments on commit afc063b

Please sign in to comment.