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 #465

Merged
merged 3 commits into from
Nov 8, 2023
Merged

Dev to main #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11fb235
Update configuration
actions-bot Nov 7, 2023
04655ff
revert "supported in other languages"
rpnykanen Nov 8, 2023
25cffe8
Merge pull request #464 from City-of-Helsinki/update-configuration
rpnykanen Nov 8, 2023
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
118 changes: 62 additions & 56 deletions composer.lock
View file
Open in desktop

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

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: DuVlqWDqCioL_uKoV5oTbHouDQZWChekxk7VhucegKM
default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg
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: MOnn4AFhzDjCTeqfjs5VvI3wK128ulmu_tPpo2VZ7YA
default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE
id: paragraph.remote_video.default
targetEntityType: paragraph
bundle: remote_video
Expand Down
4 changes: 3 additions & 1 deletion conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ dependencies:
config:
- field.storage.paragraph.field_iframe_title
- paragraphs.paragraphs_type.remote_video
_core:
default_config_hash: 4JZoeG_XitvgE9Tg7ZfVUwjpWcjeqktlO2tOnx_WfWU
id: paragraph.remote_video.field_iframe_title
field_name: field_iframe_title
entity_type: paragraph
bundle: remote_video
label: 'Assistive technology title'
description: 'Users of assistive technology need a descriptive title to know what is in the embedded content.'
description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.'
required: true
translatable: true
default_value: { }
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: 'Avustavan teknologian otsikko'
description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle.'
description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle. Älä käytä etuliitettä "Video: ". Se lisätään automaattisesti.'
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: 'Video ulkoisesta palvelusta (tuettu muilla kielillä)'
label: 'Video ulkoisesta palvelusta'
description: 'Tällä lohkolla voit upottaa videon ulkoisesta palvelusta. Tukee tällä hetkellä vain YouTubea.'
2 changes: 1 addition & 1 deletion conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: 'Hjälpmedel rubrik'
description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll.'
description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll. Använd inte prefixet "Video: ". Den läggs till automatiskt.'
2 changes: 1 addition & 1 deletion conf/cmi/language/sv/paragraphs.paragraphs_type.remote_video.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: 'Extern video (stöds på andra språk)'
label: 'Extern video'
2 changes: 1 addition & 1 deletion public/sites/default/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed {
}
$settings['reverse_proxy'] = TRUE;
$settings['reverse_proxy_addresses'] = $reverse_proxy_address;
$settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL;
$settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO;
$settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
}

Expand Down