diff --git a/composer.lock b/composer.lock index 3a404644..599d3e11 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "191be0734a279fb49f7214fcc5d7bc44", + "content-hash": "38fbf213b8fbacaa09999a9ee22b4d42", "packages": [ { "name": "asm89/stack-cors", @@ -3439,17 +3439,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" @@ -3457,8 +3457,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" @@ -3987,16 +3987,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.0", + "version": "4.3.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c9dc8ce1b7629521a08ac7de7ff3cc7a1f352573" + "reference": "419f78ccd02f71c60b194779beed067f657688b0" }, "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/419f78ccd02f71c60b194779beed067f657688b0", + "reference": "419f78ccd02f71c60b194779beed067f657688b0", "shasum": "" }, "require": { @@ -4011,23 +4011,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.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-11-16T10:05:53+00:00" + "time": "2022-11-24T09:53:50+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": { @@ -4043,10 +4043,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_ahjo", @@ -4315,16 +4315,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.15.0", + "version": "2.15.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f" + "reference": "0d39f7aa3082b4f4211bc2681d573a5509a42adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/139740f15aea3b783584320e7ecc19bc2c44ec7f", - "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/0d39f7aa3082b4f4211bc2681d573a5509a42adf", + "reference": "0d39f7aa3082b4f4211bc2681d573a5509a42adf", "shasum": "" }, "require": { @@ -4399,7 +4399,10 @@ "[#UHF-920] Token for base URL (https://www.drupal.org/project/drupal/issues/1088112).": "https://www.drupal.org/files/issues/2020-10-06/1088112-63.patch", "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299). Re-rolled for hel.fi": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/83eb65d99327bf9c9c67ca4f7c1220ae3d8e2eae/patches/drupal-3163299-ajax-exposed-filters-views-block-on-same-page.patch", "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629)": "https://www.drupal.org/files/issues/2021-07-09/2807629-45.patch", - "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch" + "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch", + "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", + "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", + "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2022-11-04/2313309-152.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4414,9 +4417,6 @@ "https://www.drupal.org/project/paragraphs/issues/2904705#comment-13836790": "https://www.drupal.org/files/issues/2020-09-25/2904705-115.patch", "[#UHF-2059] Enhancements for the Admin UI": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fdccb32397cc6fa19b4d0077b21a2b18aa6be297/patches/helfi_customizations_for_paragraphs_widget_8.x-1.12.patch" }, - "drupal/paragraphs_asymmetric_translation_widgets": { - "https://www.drupal.org/project/paragraphs_asymmetric_translation_widgets/issues/3310368": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fcf0f392edd8531089c6c9d15e2a15026dae79fb/patches/paragraphs_asymmetric_translation_widgets-3310368-check-for-subform.patch" - }, "drupal/linkit": { "[#UHF-1872] Linkit support for link field": "https://www.drupal.org/files/issues/2021-08-20/avoid-linkit-CI-issue.patch" }, @@ -4430,10 +4430,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-11-24T09:44:44+00:00" + "time": "2022-11-25T07:03:32+00:00" }, { "name": "drupal/helfi_proxy", @@ -4478,16 +4478,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": { @@ -4512,23 +4512,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": { @@ -4545,10 +4545,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", @@ -5358,17 +5358,17 @@ }, { "name": "drupal/paragraphs_asymmetric_translation_widgets", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs_asymmetric_translation_widgets.git", - "reference": "8.x-1.0" + "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs_asymmetric_translation_widgets-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "be49a32345b9a231ee5316bc5cd12160960b5264" + "url": "https://ftp.drupal.org/files/projects/paragraphs_asymmetric_translation_widgets-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "aa6721d65116a0c4b69fbc28287c20fe189668aa" }, "require": { "drupal/core": "^8 || ^9", @@ -5377,8 +5377,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0", - "datestamp": "1658305808", + "version": "8.x-1.1", + "datestamp": "1669304631", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5487,26 +5487,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." @@ -5955,32 +5955,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" @@ -9307,51 +9306,6 @@ }, "time": "2021-03-21T15:43:46+00:00" }, - { - "name": "phpstan/phpdoc-parser", - "version": "1.13.0", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "33aefcdab42900e36366d0feab6206e2dd68f947" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947", - "reference": "33aefcdab42900e36366d0feab6206e2dd68f947", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", - "symfony/process": "^5.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "PHPStan\\PhpDocParser\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPDoc parser with support for nullable, intersection and generic types", - "support": { - "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0" - }, - "time": "2022-10-21T09:57:39+00:00" - }, { "name": "psr/cache", "version": "1.0.1", @@ -9808,12 +9762,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": { @@ -14676,6 +14630,51 @@ }, "time": "2020-12-13T13:06:13+00:00" }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.13.1", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/aac44118344d197e6d5f7c6cee91885f0a89acdd", + "reference": "aac44118344d197e6d5f7c6cee91885f0a89acdd", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.1" + }, + "time": "2022-11-20T08:52:26+00:00" + }, { "name": "phpstan/phpstan", "version": "1.4.6", @@ -14792,16 +14791,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": { @@ -14857,7 +14856,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": [ { @@ -14865,7 +14864,7 @@ "type": "github" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2022-11-18T07:47:47+00:00" }, { "name": "phpunit/php-file-iterator", @@ -16883,8 +16882,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/helfi_drupal_tools": 20, - "ruflin/elastica": 20 + "drupal/helfi_drupal_tools": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml index df753313..4118693b 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/tools/make/project/install.mk b/tools/make/project/install.mk index 857117d3..84ae5d1a 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)