Skip to content

Commit

Permalink
Merge pull request #1684 from acquia/feature/site-studio-7.4.x
Browse files Browse the repository at this point in the history
Sitestudio 7.4.x changes.
  • Loading branch information
vishalkhode1 authored Dec 13, 2023
2 parents 5247ac1 + 52d08a4 commit d8d68c4
Show file tree
Hide file tree
Showing 317 changed files with 479 additions and 468 deletions.
4 changes: 2 additions & 2 deletions acms-run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ installchromedriver() {
unzip chromedriver-linux64.zip
chmod +x chromedriver-linux64/chromedriver
mv -f chromedriver-linux64/chromedriver ./vendor/bin
rm chromedriver-linux64
rm -rf chromedriver-linux64
rm chromedriver-linux64.zip
;;
"darwin"*)
Expand All @@ -40,7 +40,7 @@ installchromedriver() {
unzip chromedriver-mac-x64.zip
chmod +x chromedriver-mac-x64/chromedriver
mv -f chromedriver-mac-x64/chromedriver ./vendor/bin
rm chromedriver-mac-x64
rm -rf chromedriver-mac-x64
rm chromedriver-mac-x64.zip
;;
esac
Expand Down
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@
"drupal/core": "-p2"
},
"patches": {
"acquia/cohesion": {
"ACO-2515 - Fix schema type mismatch error for global js settings": "https://gist.githubusercontent.com/rajeshreeputra/5648d31dafbf66d8a1895bb6964ed99a/raw/f5860cbfb7e5886bc7c0652c102cab337cb59e5a/sitestudio-7.3.1-schema-errors-for-cohesion.frontend.globaljs_setting.patch"
},
"drupal/core": {
"3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch",
"Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"
Expand Down
67 changes: 32 additions & 35 deletions composer.lock

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

Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ _core:
default_config_hash: uaNr8pjt0eHtXMunemG6g1GvlpJCwf3KJ6fnvSmfE3Y
id: pack_acquia_cms_article
label: 'Acquia CMS Article'
description: ''
description: 'Acquia CMS Article related templates and styles.'
excluded_entity_types: '{"cohesion_base_styles":true,"cohesion_color":true,"cohesion_custom_style":true,"cohesion_font_library":true,"cohesion_font_stack":true,"cohesion_helper":true,"cohesion_helper_category":true,"cohesion_icon_library":true,"cohesion_master_templates":true,"cohesion_menu_templates":true,"cohesion_scss_variable":true,"cohesion_style_guide":true,"cohesion_style_guide_manager":true,"cohesion_style_helper":true,"cohesion_website_settings":true,"image_style":true,"view":true,"cohesion_component_category":true}'
settings: |
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2843,7 +2843,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4318,7 +4318,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: true
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3137,7 +3137,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2978,7 +2978,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2881,7 +2881,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ filemime: application/octet-stream
filesize: '51338'
status: '1'
created: '1659012010'
changed: '1659012010'
changed: '1701244874'
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2493,7 +2493,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
locked: false
modified: true
selectable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: true
dependencies: { }
id: pack_acquia_cms_audio
label: 'Acquia CMS Audio'
description: ''
description: 'Acquia CMS Audio related templates and styles.'
excluded_entity_types: '[]'
settings: |
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- acquia_cms_site_studio
id: pack_acquia_cms_dam
label: 'Acquia CMS DAM'
description: 'DAM related templates and image styles under this package.'
description: 'Acquia CMS DAM related templates and styles.'
excluded_entity_types: '{"cohesion_custom_style":true,"cohesion_base_styles":true,"cohesion_color":true,"cohesion_component":true,"cohesion_component_category":true,"cohesion_font_library":true,"cohesion_font_stack":true,"cohesion_helper":true,"cohesion_helper_category":true,"cohesion_icon_library":true,"cohesion_master_templates":true,"cohesion_menu_templates":true,"cohesion_scss_variable":true,"cohesion_style_guide":true,"cohesion_style_guide_manager":true,"cohesion_style_helper":true,"cohesion_view_templates":true,"cohesion_website_settings":true,"view":true}'
settings: |
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: true
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ json_values: |
}
}
json_mapper: '{}'
last_entity_update: entityupdate_0036
last_entity_update: entityupdate_0042
modified: true
selectable: false
custom: false
Expand Down
Loading

0 comments on commit d8d68c4

Please sign in to comment.