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.

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

Automatic update #866

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

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 @@ -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
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
5 changes: 5 additions & 0 deletions conf/cmi/language/fi/tfa.settings.yml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
help_text: 'Ota yhteyttä tukeen palauttaaksesi tunnuksesi käyttöön'
mail:
tfa_enabled_configuration:
body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team"
tfa_disabled_configuration:
body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team"
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: 'Помещено на главную страницу'
settings:
on_label: 'On'
off_label: 'Off'
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Body
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Link
1 change: 1 addition & 0 deletions conf/cmi/paragraphs.paragraphs_type.from_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
enforced:
module:
- paragraphs_library
- paragraphs_library
_core:
default_config_hash: OJUwL6xTTiHbXZy10swc5Fckkr7qhSm4b0nK3326LO8
id: from_library
Expand Down
3 changes: 2 additions & 1 deletion tools/make/drupal.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLEAN_EXCLUDE += $(WEBROOT)/sites/default/files
DRUPAL_DISABLE_MODULES ?= no
DRUPAL_ENABLE_MODULES ?= no
DRUPAL_PROFILE ?= minimal
DRUPAL_SITE_EMAIL ?= [email protected]
DRUPAL_SYNC_FILES ?= yes
DRUPAL_SYNC_SOURCE ?= main
DRUSH_RSYNC_MODE ?= Pakzu
Expand Down Expand Up @@ -87,7 +88,7 @@ else
endif
drush-si: ## Site install
$(call step,Do Drush site:install...\n)
$(call drush,si ${DRUSH_SI})
$(call drush,si ${DRUSH_SI} --site-mail=$(DRUPAL_SITE_EMAIL))

PHONY += drush-deploy
drush-deploy: ## Run Drush deploy
Expand Down