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

Merged
merged 3 commits into from
Aug 15, 2024
Merged

Dev to main #909

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
16e0278
Update configuration
teroelonen Aug 15, 2024
aa7adf0
Remove translation configuration of the tfa module that wasn't doing …
teroelonen Aug 15, 2024
9be6534
Merge pull request #908 from City-of-Helsinki/update-configuration
teroelonen Aug 15, 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
12 changes: 6 additions & 6 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/encrypt.profile.real_aes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ _core:
id: real_aes
label: 'Real AES'
encryption_method: real_aes
encryption_key: tfa
encryption_method_configuration: { }
encryption_key: tfa
2 changes: 1 addition & 1 deletion conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
generate_aliases: null
read_only: true
generate_aliases: null
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ id: helfi_surveys
label: 'Helfi: Survey'
label_plural: 'Helfi: Surveys'
description: ''
generate_aliases: null
read_only: true
generate_aliases: null
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/language/fi/key.key.tfa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: TFA
4 changes: 4 additions & 0 deletions conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: 'Помещено на главную страницу'
settings:
on_label: 'On'
off_label: 'Off'
4 changes: 4 additions & 0 deletions conf/cmi/language/ru/core.base_field_override.node.survey.status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: Опубликовано
settings:
on_label: 'On'
off_label: 'Off'
1 change: 1 addition & 0 deletions conf/cmi/language/ru/field.field.node.survey.body.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Body
1 change: 1 addition & 0 deletions conf/cmi/language/ru/field.field.node.survey.field_survey_link.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Link
1 change: 1 addition & 0 deletions conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Services
1 change: 1 addition & 0 deletions conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Services
Loading