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

Merged
merged 1 commit into from
Sep 13, 2023
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
83 changes: 38 additions & 45 deletions composer.lock

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

4 changes: 2 additions & 2 deletions conf/cmi/filter.format.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- helfi_api_base
- linkit
_core:
default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4
default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c
name: HTML
format: full_html
weight: 0
Expand All @@ -24,7 +24,7 @@ filters:
status: true
weight: -50
settings:
allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
allowed_html: '<em> <strong> <cite> <blockquote aria-* class=""> <ul> <ol start> <li> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
filter_html_help: true
filter_html_nofollow: false
filter_htmlcorrector:
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/filter.format.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- helfi_api_base
- linkit
_core:
default_config_hash: iir5dZUojC1bWTysG1mu4qEgxkT8Le4FLCF6C1hQSoY
default_config_hash: 6AGo1h4zFCH6SC4pUy99nHKNsUsd7ZNLffnFw9RiSBA
name: Minimal
format: minimal
weight: 0
Expand Down Expand Up @@ -42,7 +42,7 @@ filters:
status: true
weight: -50
settings:
allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
allowed_html: '<em> <strong> <ul> <ol start> <li> <p class=""> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
filter_html_help: true
filter_html_nofollow: false
filter_htmlcorrector:
Expand Down
2 changes: 1 addition & 1 deletion tools/make/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ stop: ## Stop the environment
PHONY += up
up: ## Launch the environment
$(call step,Start up the container(s)...\n)
$(call docker_compose,up -d --remove-orphans)
$(call docker_compose,up --wait --remove-orphans)

PHONY += shell
shell: ## Login to CLI container
Expand Down
2 changes: 1 addition & 1 deletion tools/make/symfony.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fix-symfony: ## Fix Symfony code style
PHONY += lint-symfony
lint-symfony: ## Lint Symfony code style
$(call step,Lint Symfony code style...\n)
$(call cs_symfony,fix --dry-run --diff --ansi src)
$(call cs_symfony,fix --dry-run --diff --ansi --verbose src)

ifeq ($(RUN_ON),docker)
define sf_console
Expand Down