Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #961

Merged
merged 40 commits into from
Nov 19, 2024
Merged

Dev to main #961

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ce549dc
Merge branch 'dev' of github.com:City-of-Helsinki/drupal-helfi-kymp i…
teroelonen Aug 30, 2024
3a36cb1
Merge branch 'dev' of github.com:City-of-Helsinki/drupal-helfi-kymp i…
teroelonen Oct 11, 2024
96700ef
UHF-8650: Fixed the privacy policy URL for the journey planner.
khalima Oct 23, 2024
8819b14
UHF-10862: Use HDBT cookie banner's cookie settings service to retrie…
khalima Oct 23, 2024
91f0766
Merge branch 'dev' of github.com:City-of-Helsinki/drupal-helfi-kymp i…
teroelonen Oct 24, 2024
2da4d73
Merge branch 'dev' of github.com:City-of-Helsinki/drupal-helfi-kymp i…
teroelonen Nov 1, 2024
a2b76ec
UHF-9866: Remove arrows from list of plans
teroelonen Nov 1, 2024
04155a0
Update elasticsearch settings
hyrsky Nov 4, 2024
e8fc57c
UHF-10719: Export config
hyrsky Nov 4, 2024
362a93c
UHF-10719: Fix search_api settings
hyrsky Nov 5, 2024
fdd20a3
Update configuration
hel-platta-automation Nov 6, 2024
4fe1913
Merge pull request #960 from City-of-Helsinki/update-configuration
teroelonen Nov 6, 2024
25ed73a
Merge pull request #954 from City-of-Helsinki/UHF-9866
teroelonen Nov 6, 2024
cfa6fff
Update configuration
hel-platta-automation Nov 11, 2024
b60cf13
UHF-9680: Uninstalled modules: eu_cookie_compliance and helfi_eu_cook…
khalima Nov 11, 2024
cf4e633
UHF-9680: Reverted obsolete configuration changes.
khalima Nov 11, 2024
3dacd8c
UHF-9680: Reverted hdbt_admin_tools.site_settings.yml.
khalima Nov 11, 2024
f25ef52
Merge pull request #962 from City-of-Helsinki/update-configuration
khalima Nov 11, 2024
c1a6832
UHF-10719: Merge remote-tracking branch 'origin/dev' into UHF-10719-e…
hyrsky Nov 11, 2024
460e2e2
Merge pull request #950 from City-of-Helsinki/UHF-10862
khalima Nov 11, 2024
95807bc
Merge pull request #964 from City-of-Helsinki/UHF-9680
khalima Nov 11, 2024
b7347cf
Merge pull request #956 from City-of-Helsinki/UHF-10719-es-errors
hyrsky Nov 11, 2024
0baa90e
UHF-10239: Added image gallery to district content type
annadruid Nov 18, 2024
0eb08fc
UHF-10239: Added dependency
annadruid Nov 18, 2024
44bd819
Update configuration
hel-platta-automation Nov 19, 2024
2c28715
Merge pull request #965 from City-of-Helsinki/update-configuration
annadruid Nov 19, 2024
f0c552d
UHF-10239: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-h…
khalima Nov 19, 2024
7501c09
UHF-10239: Added image gallery to district content type.
khalima Nov 19, 2024
56ddcdf
Update field.field.node.district.field_content.yml
khalima Nov 19, 2024
c1e098c
Merge pull request #966 from City-of-Helsinki/UHF-10239
khalima Nov 19, 2024
71e338d
Update configuration
hel-platta-automation Nov 19, 2024
97fbbbc
Merge pull request #967 from City-of-Helsinki/update-configuration
rpnykanen Nov 19, 2024
e342f0a
UHF-9680: Reverted HDBT cookie banner installation.
khalima Nov 19, 2024
9bde0a2
Merge pull request #968 from City-of-Helsinki/UHF-9680_revert
khalima Nov 19, 2024
4f20c8e
UHF-9680: Merge branch 'main' of github.com:City-of-Helsinki/drupal-h…
khalima Nov 19, 2024
3742716
UHF-9680: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-he…
khalima Nov 19, 2024
36e558b
UHF-9680: Reverted the cookie banner installation (properly).
khalima Nov 19, 2024
1ac8776
Merge pull request #969 from City-of-Helsinki/UHF-9680_revert
khalima Nov 19, 2024
3851eb0
UHF-9680: Reverted the user roles.
khalima Nov 19, 2024
e23b9d0
Merge pull request #970 from City-of-Helsinki/UHF-9680_revert
khalima Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,713 changes: 769 additions & 944 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 0 additions & 31 deletions conf/cmi/block.block.eucookiecomplianceblock.yml
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- media_library
- text
_core:
default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg
default_config_hash: VflHWgcqxxjyQ5dI9XiXzqbtlh7Pl2_qqR3bz8Zj1jg
id: paragraph.remote_video.default
targetEntityType: paragraph
bundle: remote_video
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
module:
- text
_core:
default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE
default_config_hash: TfUdaKwrwdr5ime_VDVt5VlOtlUx4tcGTVyC7dmC3Gk
id: paragraph.remote_video.default
targetEntityType: paragraph
bundle: remote_video
Expand Down
3 changes: 1 addition & 2 deletions conf/cmi/core.extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ module:
gin_toolbar: 0
hal: 0
hdbt_admin_tools: 0
hdbt_cookie_banner: 0
health_check: 0
helfi_api_base: 0
helfi_azure_fs: 0
helfi_base_content: 0
helfi_ckeditor: 0
helfi_etusivu_entities: 0
helfi_eu_cookie_compliance: 0
helfi_image_styles: 0
helfi_kymp_content: 0
helfi_kymp_migrations: 0
Expand Down Expand Up @@ -179,7 +179,6 @@ module:
paragraphs: 11
publication_date: 99
minimal: 1000
eu_cookie_compliance: 1001
theme:
claro: 0
stable9: 0
Expand Down
19 changes: 0 additions & 19 deletions conf/cmi/elasticsearch_connector.cluster.kymp.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions conf/cmi/eu_cookie_compliance.cookie_category.essential.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions conf/cmi/eu_cookie_compliance.cookie_category.preference.yml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml
View file
Open in desktop

This file was deleted.

Loading