diff --git a/composer.lock b/composer.lock
index 878e1eb5b..032c6cb80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4128,17 +4128,17 @@
},
{
"name": "drupal/externalauth",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/externalauth.git",
- "reference": "2.0.2"
+ "reference": "2.0.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.2.zip",
- "reference": "2.0.2",
- "shasum": "65c6f5ff85eea294516e7e4e6d13818f70861c72"
+ "url": "https://ftp.drupal.org/files/projects/externalauth-2.0.3.zip",
+ "reference": "2.0.3",
+ "shasum": "dae49e3df8739538d7b9371ab7fb5005b8d953fd"
},
"require": {
"drupal/core": "^9 || ^10"
@@ -4146,8 +4146,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.2",
- "datestamp": "1656486698",
+ "version": "2.0.3",
+ "datestamp": "1668777505",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4676,16 +4676,16 @@
},
{
"name": "drupal/hdbt",
- "version": "4.3.0",
+ "version": "4.3.2",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "c9dc8ce1b7629521a08ac7de7ff3cc7a1f352573"
+ "reference": "40e38b1b8feea9d63949d55af5c917be76df21f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c9dc8ce1b7629521a08ac7de7ff3cc7a1f352573",
- "reference": "c9dc8ce1b7629521a08ac7de7ff3cc7a1f352573",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/40e38b1b8feea9d63949d55af5c917be76df21f4",
+ "reference": "40e38b1b8feea9d63949d55af5c917be76df21f4",
"shasum": ""
},
"require": {
@@ -4700,23 +4700,23 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.0",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.2",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2022-11-16T10:05:53+00:00"
+ "time": "2022-11-23T07:47:28+00:00"
},
{
"name": "drupal/hdbt_admin",
- "version": "1.8.2",
+ "version": "1.8.3",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
- "reference": "74d8c167196df56026be45339a70f91b87e3c430"
+ "reference": "e63ea2c67b05dc3c4c7af3b6e416817c59c330ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/74d8c167196df56026be45339a70f91b87e3c430",
- "reference": "74d8c167196df56026be45339a70f91b87e3c430",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/e63ea2c67b05dc3c4c7af3b6e416817c59c330ed",
+ "reference": "e63ea2c67b05dc3c4c7af3b6e416817c59c330ed",
"shasum": ""
},
"require": {
@@ -4732,10 +4732,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.2",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.3",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
},
- "time": "2022-11-16T14:06:42+00:00"
+ "time": "2022-11-23T09:18:44+00:00"
},
{
"name": "drupal/helfi_api_base",
@@ -4936,16 +4936,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "2.13.16",
+ "version": "2.15.0",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "cb91004f566c82a666340f19e42b11e3f0cf83df"
+ "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cb91004f566c82a666340f19e42b11e3f0cf83df",
- "reference": "cb91004f566c82a666340f19e42b11e3f0cf83df",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/139740f15aea3b783584320e7ecc19bc2c44ec7f",
+ "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f",
"shasum": ""
},
"require": {
@@ -4982,7 +4982,7 @@
"drupal/matomo_reports": "^1.1",
"drupal/media_entity_file_replace": "^1.0",
"drupal/media_entity_soundcloud": "^3.0.0",
- "drupal/menu_block_current_language": "^1.5",
+ "drupal/menu_block_current_language": "^2.0",
"drupal/menu_link_attributes": "^1.2",
"drupal/metatag": "^1.16",
"drupal/oembed_providers": "^2.0",
@@ -5051,10 +5051,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.16",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.0",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2022-11-16T14:09:33+00:00"
+ "time": "2022-11-24T09:44:44+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -5099,16 +5099,16 @@
},
{
"name": "drupal/helfi_tpr",
- "version": "2.1.3",
+ "version": "2.1.4",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
- "reference": "5ed2a62fb51909446690421c0a89bcee38576b63"
+ "reference": "df201f00eb455d6f6a5f22c573290b272c395043"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/5ed2a62fb51909446690421c0a89bcee38576b63",
- "reference": "5ed2a62fb51909446690421c0a89bcee38576b63",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/df201f00eb455d6f6a5f22c573290b272c395043",
+ "reference": "df201f00eb455d6f6a5f22c573290b272c395043",
"shasum": ""
},
"require": {
@@ -5133,23 +5133,23 @@
],
"description": "TPR integration",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.4",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
},
- "time": "2022-10-27T05:58:29+00:00"
+ "time": "2022-11-23T09:13:30+00:00"
},
{
"name": "drupal/helfi_tunnistamo",
- "version": "2.2.2",
+ "version": "2.2.3",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git",
- "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b"
+ "reference": "74af769ef53213d89089fa3c67f641c4582a2593"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/b5329b75572bc00b4995c02d717cf168d5ccfa3b",
- "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/74af769ef53213d89089fa3c67f641c4582a2593",
+ "reference": "74af769ef53213d89089fa3c67f641c4582a2593",
"shasum": ""
},
"require": {
@@ -5166,10 +5166,10 @@
],
"description": "Tunnistamo integration",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.2",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.3",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues"
},
- "time": "2022-11-08T10:24:33+00:00"
+ "time": "2022-11-18T09:09:24+00:00"
},
{
"name": "drupal/image_style_quality",
@@ -5862,26 +5862,27 @@
},
{
"name": "drupal/menu_block_current_language",
- "version": "1.6.0",
+ "version": "2.0.0-alpha1",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_block_current_language.git",
- "reference": "8.x-1.6"
+ "reference": "2.0.0-alpha1"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_block_current_language-8.x-1.6.zip",
- "reference": "8.x-1.6",
- "shasum": "02489647e17bff7c3a1b3eb4e47c5ddea50f0840"
+ "url": "https://ftp.drupal.org/files/projects/menu_block_current_language-2.0.0-alpha1.zip",
+ "reference": "2.0.0-alpha1",
+ "shasum": "24b3830a72635879fec6bd30d721462102cb151b"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^9.3 || ^10",
+ "php": ">=8.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.6",
- "datestamp": "1621416669",
+ "version": "2.0.0-alpha1",
+ "datestamp": "1667717930",
"security-coverage": {
"status": "not-covered",
"message": "Project has not opted into security advisory coverage!"
@@ -5890,7 +5891,7 @@
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
- "GPL-2.0-or-later"
+ "GPL-2.0+"
],
"authors": [
{
@@ -5907,7 +5908,7 @@
}
],
"description": "Filters out all the menu links that does not have translation for the current language.",
- "homepage": "https://www.drupal.org/project/menu_block_current_language",
+ "homepage": "http://drupal.org/project/menu_block_current_language",
"support": {
"source": "https://git.drupalcode.org/project/menu_block_current_language"
}
@@ -6641,26 +6642,26 @@
},
{
"name": "drupal/publication_date",
- "version": "2.0.0-beta5",
+ "version": "2.0.0-beta6",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/publication_date.git",
- "reference": "8.x-2.0-beta5"
+ "reference": "8.x-2.0-beta6"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta5.zip",
- "reference": "8.x-2.0-beta5",
- "shasum": "0add730f353d15fa13a13a9a463b431e6f5a663e"
+ "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta6.zip",
+ "reference": "8.x-2.0-beta6",
+ "shasum": "16038d7f204f4ab999c68740a5db596aca142fa1"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^9.1 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-2.0-beta5",
- "datestamp": "1661984596",
+ "version": "8.x-2.0-beta6",
+ "datestamp": "1669064172",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
@@ -7341,32 +7342,31 @@
},
{
"name": "drupal/select2",
- "version": "1.13.0",
+ "version": "1.14.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/select2.git",
- "reference": "8.x-1.13"
+ "reference": "8.x-1.14"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.13.zip",
- "reference": "8.x-1.13",
- "shasum": "c02f8591104310a6395788c33e44dfab5ec6a2c1"
+ "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.14.zip",
+ "reference": "8.x-1.14",
+ "shasum": "b2cca2da6ce4bada623a386ca033ab8303434e18"
},
"require": {
- "drupal/core": "^8.8 || ^9"
+ "drupal/core": "^9 || ^10"
},
"require-dev": {
- "drupal/better_exposed_filters": "^5.0",
- "drupal/facets": "^1.5",
- "drupal/form_options_attributes": "^1.2",
- "drupal/search_api": "^1.17"
+ "drupal/facets": "2.0.x-dev",
+ "drupal/form_options_attributes": "^2.0",
+ "drupal/search_api": "^1.28"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.13",
- "datestamp": "1614609946",
+ "version": "8.x-1.14",
+ "datestamp": "1669104462",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7382,10 +7382,6 @@
"name": "Christian Fritsch",
"homepage": "https://www.drupal.org/user/2103716",
"email": "christian.fritsch@burda.com"
- },
- {
- "name": "thunderbot",
- "homepage": "https://www.drupal.org/user/3511180"
}
],
"description": "Integration with the select2 JavaScript library.",
@@ -11331,12 +11327,12 @@
"source": {
"type": "git",
"url": "https://github.com/ruflin/Elastica.git",
- "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7"
+ "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ruflin/Elastica/zipball/5fc25a4966b48ae9a631e345b167c867250a43c7",
- "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7",
+ "url": "https://api.github.com/repos/ruflin/Elastica/zipball/35cd0dc60e8eeadf7ef0203c084e0c316fda33c7",
+ "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7",
"shasum": ""
},
"require": {
@@ -11393,7 +11389,7 @@
"issues": "https://github.com/ruflin/Elastica/issues",
"source": "https://github.com/ruflin/Elastica/tree/master"
},
- "time": "2022-10-11T06:53:58+00:00"
+ "time": "2022-11-23T07:39:29+00:00"
},
{
"name": "stack/builder",
@@ -16548,16 +16544,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.18",
+ "version": "9.2.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
+ "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
- "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
+ "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
"shasum": ""
},
"require": {
@@ -16613,7 +16609,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
},
"funding": [
{
@@ -16621,7 +16617,7 @@
"type": "github"
}
],
- "time": "2022-10-27T13:35:33+00:00"
+ "time": "2022-11-18T07:47:47+00:00"
},
{
"name": "phpunit/php-file-iterator",
diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml
index 1f1efc55f..9ff1de4fd 100644
--- a/conf/cmi/views.view.media_library.yml
+++ b/conf/cmi/views.view.media_library.yml
@@ -1072,6 +1072,27 @@ display:
absolute: 0
output_url_as_text: 0
text: Edit
+ pager:
+ type: full
+ options:
+ offset: 0
+ items_per_page: 24
+ total_pages: null
+ id: 0
+ tags:
+ next: ››
+ previous: ‹‹
+ first: '« First'
+ last: 'Last »'
+ expose:
+ items_per_page: false
+ items_per_page_label: 'Items per page'
+ items_per_page_options: '6, 12, 24, 48'
+ items_per_page_options_all: false
+ items_per_page_options_all_label: '- All -'
+ offset: false
+ offset_label: Offset
+ quantity: 9
access:
type: perm
options:
@@ -1275,27 +1296,6 @@ display:
rendering_language: '***LANGUAGE_language_interface***'
display_extenders: { }
path: admin/content/media-widget
- pager:
- type: full
- options:
- offset: 0
- items_per_page: 24
- total_pages: null
- id: 0
- tags:
- next: ››
- previous: ‹‹
- first: '« First'
- last: 'Last »'
- expose:
- items_per_page: false
- items_per_page_label: 'Items per page'
- items_per_page_options: '6, 12, 24, 48'
- items_per_page_options_all: false
- items_per_page_options_all_label: '- All -'
- offset: false
- offset_label: Offset
- quantity: 9
cache_metadata:
max-age: -1
contexts:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 603e6d959..1a56d5be1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,7 +16,7 @@
-
+
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
index 857117d38..84ae5d1aa 100644
--- a/tools/make/project/install.mk
+++ b/tools/make/project/install.mk
@@ -31,8 +31,8 @@ PHONY += drush-locale-update
drush-locale-update: ## Update translations.
$(call step,Update translations...)
$(call drush,state:set locale.translation_last_checked 0)
- $(call drush_on_docker,locale:check)
- $(call drush_on_docker,locale:update)
- $(call drush_on_docker,cr)
+ $(call drush,locale:check)
+ $(call drush,locale:update)
+ $(call drush,cr)
$(call step,Import custom translations...)
$(call drush,helfi:locale-import helfi_platform_config)