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

Automatic update #643

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Automatic update #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
114 changes: 59 additions & 55 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/language/fi/core.entity_view_mode.media.image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/field.field.media.image.field_media_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
description: 'Heron kuva.'
2 changes: 1 addition & 1 deletion ...cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
description: 'Kuvallisen noston kuva.'
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
description: 'Valitse kuva, joka näytetään linkin yhteydessä.'
2 changes: 1 addition & 1 deletion conf/cmi/language/fi/media.type.image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: Kuva
label: 'Kuva (tuettu muilla kielillä)'
description: 'Mediatyyppi kuville.'
2 changes: 1 addition & 1 deletion conf/cmi/language/sv/field.field.node.news_article.field_lead_in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: Lead
label: Leda
2 changes: 1 addition & 1 deletion conf/cmi/language/sv/field.field.node.news_article.field_main_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: 'Main image'
label: Huvudbild
1 change: 0 additions & 1 deletion conf/cmi/user.role.admin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ dependencies:
- pathauto
- publication_date
- redirect
- rest
- role_delegation
- scheduler
- simple_sitemap
Expand Down
2 changes: 0 additions & 2 deletions tools/make/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ debug: ## Show debug information
$(call dbg,COMPOSER_JSON_EXISTS,${COMPOSER_JSON_EXISTS})
$(call dbg,IS_DRUPAL,${IS_DRUPAL})
$(call dbg,IS_SYMFONY,${IS_SYMFONY})
$(call dbg,IS_WP,${IS_WP})
$(call dbg,LAGOON,${LAGOON})
$(call dbg,WODBY,${WODBY})
$(call dbg,SYSTEM,${SYSTEM})
$(call dbg,WEBROOT,${WEBROOT})
$(call dbg,UNAME_S,${UNAME_S})
Expand Down
3 changes: 0 additions & 3 deletions tools/make/include.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@ endif
#

LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no)
WODBY := $(shell test -f wodby.yml && echo yes || echo no)

ifeq ($(LAGOON),yes)
SYSTEM := LAGOON
else ifeq ($(WODBY),yes)
SYSTEM := WODBY
else
SYSTEM := WHOKNOWS
endif
Expand Down