Skip to content

Commit

Permalink
Merge pull request #357 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
khalima authored Nov 29, 2023
2 parents 3a27905 + 8482a89 commit 8b25e22
Show file tree
Hide file tree
Showing 43 changed files with 2,381 additions and 1,693 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ jobs:

- name: Run PHPCS
run: |
vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal
vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal
vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal,DrupalPractice
vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice
- name: Run phpstan
run: vendor/bin/phpstan analyze

- name: Download latest dump
env:
Expand Down
120 changes: 61 additions & 59 deletions composer.lock

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

1 change: 0 additions & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ module:
file_mdm: 0
filter: 0
flysystem: 0
flysystem_azure: 0
focal_point: 0
gin_toolbar: 0
hdbt_admin_tools: 0
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ langcode: en
status: true
dependencies: { }
_core:
default_config_hash: WJDpNshFBVU0YZ20yZTKw2ZicqN9PwA0xVKU0CQTOak
default_config_hash: xNnKeE0hcae-UY0_lNU6QCmWy0Or-D1YSjvlmrh2xuo
id: chat
label: 'Functional chat cookies'
description:
value: "<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for authentication in the chat.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>\r\n\t\t\t<p>&nbsp;</p>\r\n\t\t\t</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
value: '<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>_genesys.widgets.*</td><td>hel.fi</td><td>Used for storing data required by the chat functionality.</td><td>Session</td><td>&nbsp;</td></tr><tr><td>leijuke.*</td><td>hel.fi</td><td>Used for storing data required by the chat functionality.</td><td>Session</td><td>&nbsp;</td></tr></tbody></table></figure>'
format: full_html
checkbox_default_state: unchecked
weight: -5
Loading

0 comments on commit 8b25e22

Please sign in to comment.