From e5c26ea9920ae7147fb260a6289e13aad2ad600a Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Mon, 24 Aug 2020 12:04:34 +0100 Subject: [PATCH 1/5] D8NID-832 files transliteration (#407) * Add patch for file upload transliteration option * Add transliteration config option to config --- composer.json | 3 +- composer.lock | 352 ++++++++++++++++++------------------ config/sync/system.file.yml | 1 + 3 files changed, 174 insertions(+), 182 deletions(-) diff --git a/composer.json b/composer.json index 60b184e0e..e82d1647a 100644 --- a/composer.json +++ b/composer.json @@ -142,7 +142,8 @@ "patches": { "drupal/core": { "Prevent leftover fields from causing errors like 'Call to a member function getLabel() after enabling layout_builder'": "https://www.drupal.org/files/issues/2020-01-20/2985882-53.patch", - "When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch" + "When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch", + "[PP-1] Provide options to sanitize filenames (transliterate, lowercase, replace whitespace, etc)": "https://www.drupal.org/files/issues/2019-12-06/2492171-294.patch" }, "drupal/config_split": { "General typo issues": "https://www.drupal.org/files/issues/2018-10-02/general_typo_issues-3003865-4.patch", diff --git a/composer.lock b/composer.lock index fe7a87852..d6da7c88a 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": "8a8362ac89a7a9230007b4d40cafeb61", + "content-hash": "34ae831c021204bf42c1ab0c401346d0", "packages": [ { "name": "alchemy/zippy", @@ -2367,31 +2367,28 @@ }, { "name": "drupal/chosen", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/chosen.git", - "reference": "8.x-2.9" + "reference": "8.x-2.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/chosen-8.x-2.9.zip", - "reference": "8.x-2.9", - "shasum": "28f3ce08a96bb9fd0190ad9579b3b4a9d9be79c9" + "url": "https://ftp.drupal.org/files/projects/chosen-8.x-2.10.zip", + "reference": "8.x-2.10", + "shasum": "ce6f3ea7a99ab641385c4310fad86d3e660480e0" }, "require": { "drupal/chosen_lib": "*", - "drupal/core": "~8.0", + "drupal/core": "^8 || ^9", "harvesthq/chosen": "^1.8.7" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, "drupal": { - "version": "8.x-2.9", - "datestamp": "1576594384", + "version": "8.x-2.10", + "datestamp": "1597305739", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2453,20 +2450,17 @@ }, { "name": "drupal/chosen_lib", - "version": "2.9.0", + "version": "2.10.0", "require": { "drupal/chosen": "self.version", - "drupal/core": "~8.0", + "drupal/core": "^8 || ^9", "php": ">=5.6.0" }, "type": "metapackage", "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, "drupal": { - "version": "8.x-2.9", - "datestamp": "1576594384", + "version": "8.x-2.10", + "datestamp": "1597305739", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2590,32 +2584,29 @@ }, { "name": "drupal/config_filter", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-1.5" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "81210684c378dab856b3c2bce5eeaa58992d2efc" + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "5c95f853c751a5eaa21701b540c463442b1be1e3" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "^8 || ^9" }, "suggest": { "drupal/config_split": "Split site configuration for different environments." }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.5", - "datestamp": "1572542288", + "version": "8.x-1.6", + "datestamp": "1597845156", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2624,7 +2615,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -2652,9 +2643,9 @@ "configuration management" ], "support": { - "source": "http://cgit.drupalcode.org/config_filter", + "source": "https://git.drupalcode.org/project/config_filter", "issues": "https://www.drupal.org/project/issues/config_filter", - "irc": "irc://irc.freenode.org/drupal-contribute" + "slack": "https://drupal.slack.com/archives/C45342CDD" } }, { @@ -2720,29 +2711,26 @@ }, { "name": "drupal/config_readonly", - "version": "1.0.0-beta3", + "version": "1.0.0-beta4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_readonly.git", - "reference": "8.x-1.0-beta3" + "reference": "8.x-1.0-beta4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_readonly-8.x-1.0-beta3.zip", - "reference": "8.x-1.0-beta3", - "shasum": "ef474bcf5f46221e88b1cf4fa2b6abe99439b878" + "url": "https://ftp.drupal.org/files/projects/config_readonly-8.x-1.0-beta4.zip", + "reference": "8.x-1.0-beta4", + "shasum": "5c178125865692ec356aefcaef731f1fd4aa6f2c" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "^8.7.12 || ^9" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-beta3", - "datestamp": "1519398184", + "version": "8.x-1.0-beta4", + "datestamp": "1596658248", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -2912,16 +2900,16 @@ }, { "name": "drupal/console", - "version": "1.9.4", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console.git", - "reference": "04522b687b2149dc1f808599e716421a20d50a5b" + "reference": "abcb094a30e4b2e2f153d63bcb6bd10823e0d67a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/04522b687b2149dc1f808599e716421a20d50a5b", - "reference": "04522b687b2149dc1f808599e716421a20d50a5b", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/abcb094a30e4b2e2f153d63bcb6bd10823e0d67a", + "reference": "abcb094a30e4b2e2f153d63bcb6bd10823e0d67a", "shasum": "" }, "require": { @@ -2929,13 +2917,13 @@ "composer/installers": "~1.0", "doctrine/annotations": "^1.2", "doctrine/collections": "^1.3", - "drupal/console-core": "1.9.4", + "drupal/console-core": "1.9.6", "drupal/console-extend-plugin": "~0", - "php": "^5.5.9 || ^7.0", + "php": ">=7.0.8", "psy/psysh": "0.6.* || ~0.8", - "symfony/css-selector": "~2.8|~3.0", - "symfony/dom-crawler": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0" + "symfony/css-selector": "~3.0|~4.0", + "symfony/dom-crawler": "~3.0|~4.0", + "symfony/http-foundation": "~3.0|~4.0" }, "suggest": { "symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI", @@ -2987,39 +2975,39 @@ "drupal", "symfony" ], - "time": "2019-11-11T19:35:01+00:00" + "time": "2020-08-15T05:24:08+00:00" }, { "name": "drupal/console-core", - "version": "1.9.4", + "version": "1.9.6", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-core.git", - "reference": "cc6f50c6ac8199140224347c862df75fd2d2f5ed" + "reference": "7ad17a2a616cf1a95aaef5ccd2f21483a3f00689" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/cc6f50c6ac8199140224347c862df75fd2d2f5ed", - "reference": "cc6f50c6ac8199140224347c862df75fd2d2f5ed", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/7ad17a2a616cf1a95aaef5ccd2f21483a3f00689", + "reference": "7ad17a2a616cf1a95aaef5ccd2f21483a3f00689", "shasum": "" }, "require": { "dflydev/dot-access-configuration": "^1.0", - "drupal/console-en": "1.9.4", + "drupal/console-en": "1.9.5", "guzzlehttp/guzzle": "~6.1", - "php": "^5.5.9 || ^7.0", + "php": ">=7.0.8", "stecman/symfony-console-completion": "~0.7", - "symfony/config": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/debug": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0", - "twig/twig": "^1.23.1", + "symfony/config": "~3.0|^4.4", + "symfony/console": "~3.0|^4.4", + "symfony/debug": "~3.0|^4.4", + "symfony/dependency-injection": "~3.0|^4.4", + "symfony/event-dispatcher": "~3.0|^4.4", + "symfony/filesystem": "~3.0|^4.4", + "symfony/finder": "~3.0|^4.4", + "symfony/process": "~3.0|^4.4", + "symfony/translation": "~3.0|^4.4", + "symfony/yaml": "~3.0|^4.4", + "twig/twig": "^1.38.2|^2.12.0", "webflo/drupal-finder": "^1.0", "webmozart/path-util": "^2.3" }, @@ -3069,20 +3057,20 @@ "drupal", "symfony" ], - "time": "2019-11-11T19:26:28+00:00" + "time": "2020-08-15T05:19:37+00:00" }, { "name": "drupal/console-en", - "version": "1.9.4", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-en.git", - "reference": "30813a832fdb1244e84cbcc012cd103d5e9d673d" + "reference": "7594601fff153c2799a62bd678ff80749baeee0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/30813a832fdb1244e84cbcc012cd103d5e9d673d", - "reference": "30813a832fdb1244e84cbcc012cd103d5e9d673d", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/7594601fff153c2799a62bd678ff80749baeee0c", + "reference": "7594601fff153c2799a62bd678ff80749baeee0c", "shasum": "" }, "type": "library", @@ -3123,27 +3111,27 @@ "drupal", "symfony" ], - "time": "2019-10-07T23:45:30+00:00" + "time": "2020-08-15T03:34:54+00:00" }, { "name": "drupal/console-extend-plugin", - "version": "0.9.3", + "version": "0.9.4", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-extend-plugin.git", - "reference": "ad8e52df34b2e78bdacfffecc9fe8edf41843342" + "reference": "a8cf84eaa61cf60e9cebfe131073d7628550625a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/ad8e52df34b2e78bdacfffecc9fe8edf41843342", - "reference": "ad8e52df34b2e78bdacfffecc9fe8edf41843342", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/a8cf84eaa61cf60e9cebfe131073d7628550625a", + "reference": "a8cf84eaa61cf60e9cebfe131073d7628550625a", "shasum": "" }, "require": { "composer-plugin-api": "^1.0", "composer/installers": "^1.2", - "symfony/finder": "~2.7|~3.0", - "symfony/yaml": "~2.7|~3.0" + "symfony/finder": "~3.0|^4.4", + "symfony/yaml": "~3.0|^4.4" }, "type": "composer-plugin", "extra": { @@ -3165,7 +3153,7 @@ } ], "description": "Drupal Console Extend Plugin", - "time": "2019-11-07T20:15:27+00:00" + "time": "2020-08-15T04:57:23+00:00" }, { "name": "drupal/core", @@ -3375,7 +3363,8 @@ }, "patches_applied": { "Prevent leftover fields from causing errors like 'Call to a member function getLabel() after enabling layout_builder'": "https://www.drupal.org/files/issues/2020-01-20/2985882-53.patch", - "When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch" + "When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch", + "[PP-1] Provide options to sanitize filenames (transliterate, lowercase, replace whitespace, etc)": "https://www.drupal.org/files/issues/2019-12-06/2492171-294.patch" } }, "autoload": { @@ -3403,7 +3392,7 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "8.9.2", + "version": "8.9.3", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3450,16 +3439,16 @@ }, { "name": "drupal/core-project-message", - "version": "8.9.2", + "version": "8.9.3", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", - "reference": "e0e237d3da026a87784f70c1069345855340ec23" + "reference": "3f8fa28128f1fef68ee0e6647011a543ef92be5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-project-message/zipball/e0e237d3da026a87784f70c1069345855340ec23", - "reference": "e0e237d3da026a87784f70c1069345855340ec23", + "url": "https://api.github.com/repos/drupal/core-project-message/zipball/3f8fa28128f1fef68ee0e6647011a543ef92be5b", + "reference": "3f8fa28128f1fef68ee0e6647011a543ef92be5b", "shasum": "" }, "require": { @@ -3484,7 +3473,7 @@ "keywords": [ "drupal" ], - "time": "2020-05-11T08:00:18+00:00" + "time": "2020-08-02T22:04:49+00:00" }, { "name": "drupal/core-recommended", @@ -4041,17 +4030,17 @@ }, { "name": "drupal/entityqueue", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entityqueue.git", - "reference": "8.x-1.0" + "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "c108a7303d401d803994025d4855ed171a434593" + "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "6e59fb4ee782a69708a7845573a151eb8b83899a" }, "require": { "drupal/core": "^8.7.7 || ^9" @@ -4059,8 +4048,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0", - "datestamp": "1586937737", + "version": "8.x-1.1", + "datestamp": "1597742392", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4069,7 +4058,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -4561,7 +4550,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag.git", - "reference": "d1671b8351f3513911aad0980b74fb376a7f297a" + "reference": "adbaab83407641dc52198e7e656ce20db03207a7" }, "require": { "drupal/core": "^8.8 || ^9" @@ -4627,7 +4616,7 @@ "support": { "source": "https://git.drupalcode.org/project/flag" }, - "time": "2020-07-20T19:21:04+00:00" + "time": "2020-08-07T07:05:58+00:00" }, { "name": "drupal/geocoder", @@ -5262,17 +5251,17 @@ }, { "name": "drupal/metatag", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/metatag.git", - "reference": "8.x-1.13" + "reference": "8.x-1.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.13.zip", - "reference": "8.x-1.13", - "shasum": "c471d9982a6540fd7baccc94572947923634fb6b" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.14.zip", + "reference": "8.x-1.14", + "shasum": "9bf9f1517ad015d0c93ca1460e284c557624aa90" }, "require": { "drupal/core": "^8 || ^9", @@ -5282,13 +5271,14 @@ "drupal/metatag_dc": "*", "drupal/metatag_open_graph": "*", "drupal/page_manager": "4.x-dev", + "drupal/panelizer": "4.x-dev", "drupal/redirect": "1.x-dev" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.13", - "datestamp": "1587478404", + "version": "8.x-1.14", + "datestamp": "1597183852", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5297,7 +5287,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -7293,16 +7283,16 @@ }, { "name": "drush/drush", - "version": "10.3.2", + "version": "10.3.4", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "0904ee08d4af9007eb15a0947af3ba27fe6b3408" + "reference": "802419a6eb0232bdb977788e6a828cd4fa5bdb11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/0904ee08d4af9007eb15a0947af3ba27fe6b3408", - "reference": "0904ee08d4af9007eb15a0947af3ba27fe6b3408", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/802419a6eb0232bdb977788e6a828cd4fa5bdb11", + "reference": "802419a6eb0232bdb977788e6a828cd4fa5bdb11", "shasum": "" }, "require": { @@ -7315,6 +7305,7 @@ "consolidation/site-process": "^2.1 || ^4", "ext-dom": "*", "grasmash/yaml-expander": "^1.1.1", + "guzzlehttp/guzzle": "^6.3", "league/container": "~2", "php": ">=7.1.3", "psr/log": "~1.0", @@ -7419,7 +7410,7 @@ ], "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.", "homepage": "http://www.drush.org", - "time": "2020-08-04T19:20:10+00:00" + "time": "2020-08-20T19:27:28+00:00" }, { "name": "easyrdf/easyrdf", @@ -7672,16 +7663,16 @@ }, { "name": "gasparesganga/php-shapefile", - "version": "v3.3.0", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/gasparesganga/php-shapefile.git", - "reference": "af9b7221ddaf36a85a37e6a23281bd53ed750c4d" + "reference": "ae86a406f9a8191adc00724f032587b2287a8310" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gasparesganga/php-shapefile/zipball/af9b7221ddaf36a85a37e6a23281bd53ed750c4d", - "reference": "af9b7221ddaf36a85a37e6a23281bd53ed750c4d", + "url": "https://api.github.com/repos/gasparesganga/php-shapefile/zipball/ae86a406f9a8191adc00724f032587b2287a8310", + "reference": "ae86a406f9a8191adc00724f032587b2287a8310", "shasum": "" }, "require": { @@ -7716,7 +7707,7 @@ "shp", "wkt" ], - "time": "2020-05-23T09:10:21+00:00" + "time": "2020-08-17T13:52:01+00:00" }, { "name": "giggsey/libphonenumber-for-php", @@ -8588,16 +8579,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.7.0", + "version": "v4.9.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300" + "reference": "aaee038b912e567780949787d5fe1977be11a778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", - "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/aaee038b912e567780949787d5fe1977be11a778", + "reference": "aaee038b912e567780949787d5fe1977be11a778", "shasum": "" }, "require": { @@ -8605,8 +8596,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -8614,7 +8605,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.7-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -8636,7 +8627,7 @@ "parser", "php" ], - "time": "2020-07-25T13:18:53+00:00" + "time": "2020-08-18T19:48:01+00:00" }, { "name": "oomphinc/composer-installers-extender", @@ -9578,32 +9569,32 @@ }, { "name": "symfony/config", - "version": "v3.4.43", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "9e2aa97f0d51f114983666f5aa362426d53e004a" + "reference": "b1d8f0d9341ea1d378b8b043ba90739f37c49d36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/9e2aa97f0d51f114983666f5aa362426d53e004a", - "reference": "9e2aa97f0d51f114983666f5aa362426d53e004a", + "url": "https://api.github.com/repos/symfony/config/zipball/b1d8f0d9341ea1d378b8b043ba90739f37c49d36", + "reference": "b1d8f0d9341ea1d378b8b043ba90739f37c49d36", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0", + "php": ">=7.1.3", + "symfony/filesystem": "^3.4|^4.0|^5.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/event-dispatcher": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" + "symfony/event-dispatcher": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/messenger": "^4.1|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -9611,7 +9602,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -9638,7 +9629,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2020-07-23T09:37:51+00:00" + "time": "2020-07-15T08:27:46+00:00" }, { "name": "symfony/console", @@ -9894,25 +9885,25 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.4.43", + "version": "v4.2.12", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "fc66039e3138db2fc54ee9ad30646d99c4495691" + "reference": "ba1da8fb10291714b8db153fcf7ac515e1a217bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc66039e3138db2fc54ee9ad30646d99c4495691", - "reference": "fc66039e3138db2fc54ee9ad30646d99c4495691", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ba1da8fb10291714b8db153fcf7ac515e1a217bb", + "reference": "ba1da8fb10291714b8db153fcf7ac515e1a217bb", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0|~4.0" + "symfony/css-selector": "~3.4|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -9920,7 +9911,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -9947,7 +9938,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2020-07-16T09:41:49+00:00" + "time": "2019-06-13T10:57:15+00:00" }, { "name": "symfony/event-dispatcher", @@ -12475,16 +12466,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.2", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" + "reference": "ebd27a9866ae8254e873866f795491f02418c5a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5", + "reference": "ebd27a9866ae8254e873866f795491f02418c5a5", "shasum": "" }, "require": { @@ -12515,7 +12506,7 @@ "Xdebug", "performance" ], - "time": "2020-06-04T11:16:35+00:00" + "time": "2020-08-19T10:27:58+00:00" }, { "name": "doctrine/instantiator", @@ -12613,16 +12604,16 @@ }, { "name": "drupal/core-dev", - "version": "8.9.2", + "version": "8.8.8", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "36370b3f42911c09ffb35f08fc72853d20e6efd7" + "reference": "edeec67c12be4b459d2873ac99044787b51ebe42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/36370b3f42911c09ffb35f08fc72853d20e6efd7", - "reference": "36370b3f42911c09ffb35f08fc72853d20e6efd7", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/edeec67c12be4b459d2873ac99044787b51ebe42", + "reference": "edeec67c12be4b459d2873ac99044787b51ebe42", "shasum": "" }, "require": { @@ -12630,7 +12621,7 @@ "behat/mink-goutte-driver": "^1.2", "behat/mink-selenium2-driver": "^1.4", "composer/composer": "^1.9.1", - "drupal/coder": "^8.3.7", + "drupal/coder": "^8.3.2", "jcalderonzumba/gastonjs": "^1.0.2", "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "justinrainbow/json-schema": "^5.2", @@ -12640,7 +12631,6 @@ "symfony/browser-kit": "^3.4.0", "symfony/css-selector": "^3.4.0", "symfony/debug": "^3.4.0", - "symfony/dom-crawler": "^3.4.0 !=3.4.38", "symfony/filesystem": "~3.4.0", "symfony/finder": "~3.4.0", "symfony/lock": "~3.4.0", @@ -12655,7 +12645,7 @@ "GPL-2.0-or-later" ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", - "time": "2020-05-09T07:53:22+00:00" + "time": "2020-05-19T10:05:59+00:00" }, { "name": "drupal/devel", @@ -13851,16 +13841,16 @@ }, { "name": "nette/di", - "version": "v3.0.4", + "version": "v3.0.5", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "34d3e47ebe96229b7671664893a3b1128c102213" + "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/34d3e47ebe96229b7671664893a3b1128c102213", - "reference": "34d3e47ebe96229b7671664893a3b1128c102213", + "url": "https://api.github.com/repos/nette/di/zipball/766e8185196a97ded4f9128db6d79a3a124b7eb6", + "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6", "shasum": "" }, "require": { @@ -13918,7 +13908,7 @@ "nette", "static" ], - "time": "2020-05-14T10:29:59+00:00" + "time": "2020-08-13T13:04:23+00:00" }, { "name": "nette/finder", @@ -14230,16 +14220,16 @@ }, { "name": "nette/utils", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9" + "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/488f58378bba71767e7831c83f9e0fa808bf83b9", - "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9", + "url": "https://api.github.com/repos/nette/utils/zipball/c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", + "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", "shasum": "" }, "require": { @@ -14304,7 +14294,7 @@ "utility", "validation" ], - "time": "2020-05-27T09:58:51+00:00" + "time": "2020-08-07T10:34:21+00:00" }, { "name": "ocramius/package-versions", @@ -15793,16 +15783,16 @@ }, { "name": "seld/jsonlint", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" + "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd", + "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd", "shasum": "" }, "require": { @@ -15838,7 +15828,7 @@ "parser", "validator" ], - "time": "2020-04-30T19:05:18+00:00" + "time": "2020-08-13T09:07:59+00:00" }, { "name": "seld/phar-utils", @@ -15886,16 +15876,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.5", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", "shasum": "" }, "require": { @@ -15933,7 +15923,7 @@ "phpcs", "standards" ], - "time": "2020-04-17T01:09:41+00:00" + "time": "2020-08-10T04:50:15+00:00" }, { "name": "symfony/browser-kit", diff --git a/config/sync/system.file.yml b/config/sync/system.file.yml index 1d8dc385e..10d2297a0 100644 --- a/config/sync/system.file.yml +++ b/config/sync/system.file.yml @@ -4,3 +4,4 @@ path: { } temporary_maximum_age: 21600 _core: default_config_hash: t48gCU9DzYfjb3bAOIqHLzhL0ChBlXh6_5B5Pyo9t8g +filename_transliteration: true From c6b448f98b43fb39b1eb83535cfb3d25dead2479 Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Mon, 24 Aug 2020 12:31:58 +0100 Subject: [PATCH 2/5] Add block_content_permissions module + related config (#408) --- composer.json | 1 + composer.lock | 380 +++++++++++++---------- config/sync/core.extension.yml | 1 + config/sync/user.role.admin_user.yml | 20 ++ config/sync/user.role.editor_user.yml | 20 ++ config/sync/views.view.block_content.yml | 2 +- 6 files changed, 257 insertions(+), 167 deletions(-) diff --git a/composer.json b/composer.json index e82d1647a..b165ef935 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ "drupal/adminimal_theme": "^1.5", "drupal/better_field_descriptions": "^1.5", "drupal/block_blacklist": "^1.0", + "drupal/block_content_permissions": "^1.10", "drupal/chosen": "^2.9", "drupal/clientside_validation": "^1.2", "drupal/config_filter": "^1.4", diff --git a/composer.lock b/composer.lock index d6da7c88a..34b3aba12 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": "34ae831c021204bf42c1ab0c401346d0", + "content-hash": "4550ae17a7ff7eebc963eadecdd339ef", "packages": [ { "name": "alchemy/zippy", @@ -2365,19 +2365,68 @@ "source": "https://git.drupalcode.org/project/block_blacklist" } }, + { + "name": "drupal/block_content_permissions", + "version": "1.10.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/block_content_permissions.git", + "reference": "8.x-1.10" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/block_content_permissions-8.x-1.10.zip", + "reference": "8.x-1.10", + "shasum": "03cfd1ff8edb05ea0f953916b23ef7b3aed82ab4" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "suggest": { + "drupal/block_region_permissions": "Block Region Permissions adds permissions for administering 'blocks' based on each theme's regions." + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.10", + "datestamp": "1593975004", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Joshua Roberson", + "homepage": "https://www.drupal.org/u/joshuaroberson", + "role": "Maintainer" + } + ], + "description": "Block Content Permissions adds permissions for administering 'block content types' and 'block content'.", + "homepage": "https://www.drupal.org/project/block_content_permissions", + "support": { + "source": "https://git.drupalcode.org/project/block_content_permissions", + "issues": "https://www.drupal.org/project/issues/block_content_permissions" + } + }, { "name": "drupal/chosen", - "version": "2.10.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/chosen.git", - "reference": "8.x-2.10" + "reference": "8.x-2.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/chosen-8.x-2.10.zip", - "reference": "8.x-2.10", - "shasum": "ce6f3ea7a99ab641385c4310fad86d3e660480e0" + "url": "https://ftp.drupal.org/files/projects/chosen-8.x-2.9.zip", + "reference": "8.x-2.9", + "shasum": "28f3ce08a96bb9fd0190ad9579b3b4a9d9be79c9" }, "require": { "drupal/chosen_lib": "*", @@ -2387,8 +2436,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.10", - "datestamp": "1597305739", + "version": "8.x-2.9", + "datestamp": "1576963005", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2450,7 +2499,7 @@ }, { "name": "drupal/chosen_lib", - "version": "2.10.0", + "version": "2.9.0", "require": { "drupal/chosen": "self.version", "drupal/core": "^8 || ^9", @@ -2459,8 +2508,8 @@ "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.10", - "datestamp": "1597305739", + "version": "8.x-2.9", + "datestamp": "1576963005", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2584,17 +2633,17 @@ }, { "name": "drupal/config_filter", - "version": "1.6.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-1.6" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "5c95f853c751a5eaa21701b540c463442b1be1e3" + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "81210684c378dab856b3c2bce5eeaa58992d2efc" }, "require": { "drupal/core": "^8 || ^9" @@ -2605,8 +2654,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1597845156", + "version": "8.x-1.5", + "datestamp": "1572542288", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2615,7 +2664,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -2643,9 +2692,9 @@ "configuration management" ], "support": { - "source": "https://git.drupalcode.org/project/config_filter", + "source": "http://cgit.drupalcode.org/config_filter", "issues": "https://www.drupal.org/project/issues/config_filter", - "slack": "https://drupal.slack.com/archives/C45342CDD" + "irc": "irc://irc.freenode.org/drupal-contribute" } }, { @@ -2711,26 +2760,26 @@ }, { "name": "drupal/config_readonly", - "version": "1.0.0-beta4", + "version": "1.0.0-beta3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_readonly.git", - "reference": "8.x-1.0-beta4" + "reference": "8.x-1.0-beta3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_readonly-8.x-1.0-beta4.zip", - "reference": "8.x-1.0-beta4", - "shasum": "5c178125865692ec356aefcaef731f1fd4aa6f2c" + "url": "https://ftp.drupal.org/files/projects/config_readonly-8.x-1.0-beta3.zip", + "reference": "8.x-1.0-beta3", + "shasum": "ef474bcf5f46221e88b1cf4fa2b6abe99439b878" }, "require": { - "drupal/core": "^8.7.12 || ^9" + "drupal/core": "~8.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-beta4", - "datestamp": "1596658248", + "version": "8.x-1.0-beta3", + "datestamp": "1519398184", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -2900,16 +2949,16 @@ }, { "name": "drupal/console", - "version": "1.9.5", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console.git", - "reference": "abcb094a30e4b2e2f153d63bcb6bd10823e0d67a" + "reference": "04522b687b2149dc1f808599e716421a20d50a5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/abcb094a30e4b2e2f153d63bcb6bd10823e0d67a", - "reference": "abcb094a30e4b2e2f153d63bcb6bd10823e0d67a", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/04522b687b2149dc1f808599e716421a20d50a5b", + "reference": "04522b687b2149dc1f808599e716421a20d50a5b", "shasum": "" }, "require": { @@ -2917,13 +2966,13 @@ "composer/installers": "~1.0", "doctrine/annotations": "^1.2", "doctrine/collections": "^1.3", - "drupal/console-core": "1.9.6", + "drupal/console-core": "1.9.4", "drupal/console-extend-plugin": "~0", - "php": ">=7.0.8", + "php": "^5.5.9 || ^7.0", "psy/psysh": "0.6.* || ~0.8", - "symfony/css-selector": "~3.0|~4.0", - "symfony/dom-crawler": "~3.0|~4.0", - "symfony/http-foundation": "~3.0|~4.0" + "symfony/css-selector": "~2.8|~3.0", + "symfony/dom-crawler": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0" }, "suggest": { "symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI", @@ -2975,39 +3024,39 @@ "drupal", "symfony" ], - "time": "2020-08-15T05:24:08+00:00" + "time": "2019-11-11T19:35:01+00:00" }, { "name": "drupal/console-core", - "version": "1.9.6", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-core.git", - "reference": "7ad17a2a616cf1a95aaef5ccd2f21483a3f00689" + "reference": "cc6f50c6ac8199140224347c862df75fd2d2f5ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/7ad17a2a616cf1a95aaef5ccd2f21483a3f00689", - "reference": "7ad17a2a616cf1a95aaef5ccd2f21483a3f00689", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/cc6f50c6ac8199140224347c862df75fd2d2f5ed", + "reference": "cc6f50c6ac8199140224347c862df75fd2d2f5ed", "shasum": "" }, "require": { "dflydev/dot-access-configuration": "^1.0", - "drupal/console-en": "1.9.5", + "drupal/console-en": "1.9.4", "guzzlehttp/guzzle": "~6.1", - "php": ">=7.0.8", + "php": "^5.5.9 || ^7.0", "stecman/symfony-console-completion": "~0.7", - "symfony/config": "~3.0|^4.4", - "symfony/console": "~3.0|^4.4", - "symfony/debug": "~3.0|^4.4", - "symfony/dependency-injection": "~3.0|^4.4", - "symfony/event-dispatcher": "~3.0|^4.4", - "symfony/filesystem": "~3.0|^4.4", - "symfony/finder": "~3.0|^4.4", - "symfony/process": "~3.0|^4.4", - "symfony/translation": "~3.0|^4.4", - "symfony/yaml": "~3.0|^4.4", - "twig/twig": "^1.38.2|^2.12.0", + "symfony/config": "~2.8|~3.0", + "symfony/console": "~2.8|~3.0", + "symfony/debug": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/filesystem": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0", + "symfony/translation": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0", + "twig/twig": "^1.23.1", "webflo/drupal-finder": "^1.0", "webmozart/path-util": "^2.3" }, @@ -3057,20 +3106,20 @@ "drupal", "symfony" ], - "time": "2020-08-15T05:19:37+00:00" + "time": "2019-11-11T19:26:28+00:00" }, { "name": "drupal/console-en", - "version": "1.9.5", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-en.git", - "reference": "7594601fff153c2799a62bd678ff80749baeee0c" + "reference": "30813a832fdb1244e84cbcc012cd103d5e9d673d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/7594601fff153c2799a62bd678ff80749baeee0c", - "reference": "7594601fff153c2799a62bd678ff80749baeee0c", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/30813a832fdb1244e84cbcc012cd103d5e9d673d", + "reference": "30813a832fdb1244e84cbcc012cd103d5e9d673d", "shasum": "" }, "type": "library", @@ -3111,27 +3160,27 @@ "drupal", "symfony" ], - "time": "2020-08-15T03:34:54+00:00" + "time": "2019-10-07T23:45:30+00:00" }, { "name": "drupal/console-extend-plugin", - "version": "0.9.4", + "version": "0.9.3", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-extend-plugin.git", - "reference": "a8cf84eaa61cf60e9cebfe131073d7628550625a" + "reference": "ad8e52df34b2e78bdacfffecc9fe8edf41843342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/a8cf84eaa61cf60e9cebfe131073d7628550625a", - "reference": "a8cf84eaa61cf60e9cebfe131073d7628550625a", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/ad8e52df34b2e78bdacfffecc9fe8edf41843342", + "reference": "ad8e52df34b2e78bdacfffecc9fe8edf41843342", "shasum": "" }, "require": { "composer-plugin-api": "^1.0", "composer/installers": "^1.2", - "symfony/finder": "~3.0|^4.4", - "symfony/yaml": "~3.0|^4.4" + "symfony/finder": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0" }, "type": "composer-plugin", "extra": { @@ -3153,7 +3202,7 @@ } ], "description": "Drupal Console Extend Plugin", - "time": "2020-08-15T04:57:23+00:00" + "time": "2019-11-07T20:15:27+00:00" }, { "name": "drupal/core", @@ -3392,7 +3441,7 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "8.9.3", + "version": "8.9.2", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3439,16 +3488,16 @@ }, { "name": "drupal/core-project-message", - "version": "8.9.3", + "version": "8.9.2", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", - "reference": "3f8fa28128f1fef68ee0e6647011a543ef92be5b" + "reference": "e0e237d3da026a87784f70c1069345855340ec23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-project-message/zipball/3f8fa28128f1fef68ee0e6647011a543ef92be5b", - "reference": "3f8fa28128f1fef68ee0e6647011a543ef92be5b", + "url": "https://api.github.com/repos/drupal/core-project-message/zipball/e0e237d3da026a87784f70c1069345855340ec23", + "reference": "e0e237d3da026a87784f70c1069345855340ec23", "shasum": "" }, "require": { @@ -3473,7 +3522,7 @@ "keywords": [ "drupal" ], - "time": "2020-08-02T22:04:49+00:00" + "time": "2020-05-11T08:00:18+00:00" }, { "name": "drupal/core-recommended", @@ -4030,17 +4079,17 @@ }, { "name": "drupal/entityqueue", - "version": "1.1.0", + "version": "1.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entityqueue.git", - "reference": "8.x-1.1" + "reference": "8.x-1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "6e59fb4ee782a69708a7845573a151eb8b83899a" + "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "c108a7303d401d803994025d4855ed171a434593" }, "require": { "drupal/core": "^8.7.7 || ^9" @@ -4048,8 +4097,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1597742392", + "version": "8.x-1.0", + "datestamp": "1586937737", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4058,7 +4107,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -4550,7 +4599,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag.git", - "reference": "adbaab83407641dc52198e7e656ce20db03207a7" + "reference": "d1671b8351f3513911aad0980b74fb376a7f297a" }, "require": { "drupal/core": "^8.8 || ^9" @@ -4616,7 +4665,7 @@ "support": { "source": "https://git.drupalcode.org/project/flag" }, - "time": "2020-08-07T07:05:58+00:00" + "time": "2020-07-20T19:21:04+00:00" }, { "name": "drupal/geocoder", @@ -5251,17 +5300,17 @@ }, { "name": "drupal/metatag", - "version": "1.14.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/metatag.git", - "reference": "8.x-1.14" + "reference": "8.x-1.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.14.zip", - "reference": "8.x-1.14", - "shasum": "9bf9f1517ad015d0c93ca1460e284c557624aa90" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.13.zip", + "reference": "8.x-1.13", + "shasum": "c471d9982a6540fd7baccc94572947923634fb6b" }, "require": { "drupal/core": "^8 || ^9", @@ -5271,14 +5320,13 @@ "drupal/metatag_dc": "*", "drupal/metatag_open_graph": "*", "drupal/page_manager": "4.x-dev", - "drupal/panelizer": "4.x-dev", "drupal/redirect": "1.x-dev" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.14", - "datestamp": "1597183852", + "version": "8.x-1.13", + "datestamp": "1587550202", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5287,7 +5335,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -7283,16 +7331,16 @@ }, { "name": "drush/drush", - "version": "10.3.4", + "version": "10.3.2", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "802419a6eb0232bdb977788e6a828cd4fa5bdb11" + "reference": "0904ee08d4af9007eb15a0947af3ba27fe6b3408" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/802419a6eb0232bdb977788e6a828cd4fa5bdb11", - "reference": "802419a6eb0232bdb977788e6a828cd4fa5bdb11", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/0904ee08d4af9007eb15a0947af3ba27fe6b3408", + "reference": "0904ee08d4af9007eb15a0947af3ba27fe6b3408", "shasum": "" }, "require": { @@ -7305,7 +7353,6 @@ "consolidation/site-process": "^2.1 || ^4", "ext-dom": "*", "grasmash/yaml-expander": "^1.1.1", - "guzzlehttp/guzzle": "^6.3", "league/container": "~2", "php": ">=7.1.3", "psr/log": "~1.0", @@ -7410,7 +7457,7 @@ ], "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.", "homepage": "http://www.drush.org", - "time": "2020-08-20T19:27:28+00:00" + "time": "2020-08-04T19:20:10+00:00" }, { "name": "easyrdf/easyrdf", @@ -7663,16 +7710,16 @@ }, { "name": "gasparesganga/php-shapefile", - "version": "v3.3.2", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/gasparesganga/php-shapefile.git", - "reference": "ae86a406f9a8191adc00724f032587b2287a8310" + "reference": "af9b7221ddaf36a85a37e6a23281bd53ed750c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gasparesganga/php-shapefile/zipball/ae86a406f9a8191adc00724f032587b2287a8310", - "reference": "ae86a406f9a8191adc00724f032587b2287a8310", + "url": "https://api.github.com/repos/gasparesganga/php-shapefile/zipball/af9b7221ddaf36a85a37e6a23281bd53ed750c4d", + "reference": "af9b7221ddaf36a85a37e6a23281bd53ed750c4d", "shasum": "" }, "require": { @@ -7707,7 +7754,7 @@ "shp", "wkt" ], - "time": "2020-08-17T13:52:01+00:00" + "time": "2020-05-23T09:10:21+00:00" }, { "name": "giggsey/libphonenumber-for-php", @@ -8579,16 +8626,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.9.0", + "version": "v4.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "aaee038b912e567780949787d5fe1977be11a778" + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/aaee038b912e567780949787d5fe1977be11a778", - "reference": "aaee038b912e567780949787d5fe1977be11a778", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", "shasum": "" }, "require": { @@ -8596,8 +8643,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "ircmaxell/php-yacc": "0.0.5", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" }, "bin": [ "bin/php-parse" @@ -8605,7 +8652,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "4.7-dev" } }, "autoload": { @@ -8627,7 +8674,7 @@ "parser", "php" ], - "time": "2020-08-18T19:48:01+00:00" + "time": "2020-07-25T13:18:53+00:00" }, { "name": "oomphinc/composer-installers-extender", @@ -9569,32 +9616,32 @@ }, { "name": "symfony/config", - "version": "v4.4.11", + "version": "v3.4.43", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "b1d8f0d9341ea1d378b8b043ba90739f37c49d36" + "reference": "9e2aa97f0d51f114983666f5aa362426d53e004a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/b1d8f0d9341ea1d378b8b043ba90739f37c49d36", - "reference": "b1d8f0d9341ea1d378b8b043ba90739f37c49d36", + "url": "https://api.github.com/repos/symfony/config/zipball/9e2aa97f0d51f114983666f5aa362426d53e004a", + "reference": "9e2aa97f0d51f114983666f5aa362426d53e004a", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/filesystem": "^3.4|^4.0|^5.0", + "php": "^5.5.9|>=7.0.8", + "symfony/filesystem": "~2.8|~3.0|~4.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<3.4" + "symfony/dependency-injection": "<3.3", + "symfony/finder": "<3.3" }, "require-dev": { - "symfony/event-dispatcher": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/messenger": "^4.1|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/event-dispatcher": "~3.3|~4.0", + "symfony/finder": "~3.3|~4.0", + "symfony/yaml": "~3.0|~4.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -9602,7 +9649,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -9629,7 +9676,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2020-07-15T08:27:46+00:00" + "time": "2020-07-23T09:37:51+00:00" }, { "name": "symfony/console", @@ -9885,25 +9932,25 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.2.12", + "version": "v3.4.43", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "ba1da8fb10291714b8db153fcf7ac515e1a217bb" + "reference": "fc66039e3138db2fc54ee9ad30646d99c4495691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ba1da8fb10291714b8db153fcf7ac515e1a217bb", - "reference": "ba1da8fb10291714b8db153fcf7ac515e1a217bb", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc66039e3138db2fc54ee9ad30646d99c4495691", + "reference": "fc66039e3138db2fc54ee9ad30646d99c4495691", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~3.4|~4.0" + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -9911,7 +9958,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -9938,7 +9985,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-06-13T10:57:15+00:00" + "time": "2020-07-16T09:41:49+00:00" }, { "name": "symfony/event-dispatcher", @@ -12466,16 +12513,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.3", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5" + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", "shasum": "" }, "require": { @@ -12506,7 +12553,7 @@ "Xdebug", "performance" ], - "time": "2020-08-19T10:27:58+00:00" + "time": "2020-06-04T11:16:35+00:00" }, { "name": "doctrine/instantiator", @@ -12604,16 +12651,16 @@ }, { "name": "drupal/core-dev", - "version": "8.8.8", + "version": "8.9.2", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "edeec67c12be4b459d2873ac99044787b51ebe42" + "reference": "36370b3f42911c09ffb35f08fc72853d20e6efd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/edeec67c12be4b459d2873ac99044787b51ebe42", - "reference": "edeec67c12be4b459d2873ac99044787b51ebe42", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/36370b3f42911c09ffb35f08fc72853d20e6efd7", + "reference": "36370b3f42911c09ffb35f08fc72853d20e6efd7", "shasum": "" }, "require": { @@ -12621,7 +12668,7 @@ "behat/mink-goutte-driver": "^1.2", "behat/mink-selenium2-driver": "^1.4", "composer/composer": "^1.9.1", - "drupal/coder": "^8.3.2", + "drupal/coder": "^8.3.7", "jcalderonzumba/gastonjs": "^1.0.2", "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "justinrainbow/json-schema": "^5.2", @@ -12631,6 +12678,7 @@ "symfony/browser-kit": "^3.4.0", "symfony/css-selector": "^3.4.0", "symfony/debug": "^3.4.0", + "symfony/dom-crawler": "^3.4.0 !=3.4.38", "symfony/filesystem": "~3.4.0", "symfony/finder": "~3.4.0", "symfony/lock": "~3.4.0", @@ -12645,7 +12693,7 @@ "GPL-2.0-or-later" ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", - "time": "2020-05-19T10:05:59+00:00" + "time": "2020-05-09T07:53:22+00:00" }, { "name": "drupal/devel", @@ -13841,16 +13889,16 @@ }, { "name": "nette/di", - "version": "v3.0.5", + "version": "v3.0.4", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6" + "reference": "34d3e47ebe96229b7671664893a3b1128c102213" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/766e8185196a97ded4f9128db6d79a3a124b7eb6", - "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6", + "url": "https://api.github.com/repos/nette/di/zipball/34d3e47ebe96229b7671664893a3b1128c102213", + "reference": "34d3e47ebe96229b7671664893a3b1128c102213", "shasum": "" }, "require": { @@ -13908,7 +13956,7 @@ "nette", "static" ], - "time": "2020-08-13T13:04:23+00:00" + "time": "2020-05-14T10:29:59+00:00" }, { "name": "nette/finder", @@ -14220,16 +14268,16 @@ }, { "name": "nette/utils", - "version": "v3.1.3", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f" + "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", - "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", + "url": "https://api.github.com/repos/nette/utils/zipball/488f58378bba71767e7831c83f9e0fa808bf83b9", + "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9", "shasum": "" }, "require": { @@ -14294,7 +14342,7 @@ "utility", "validation" ], - "time": "2020-08-07T10:34:21+00:00" + "time": "2020-05-27T09:58:51+00:00" }, { "name": "ocramius/package-versions", @@ -15783,16 +15831,16 @@ }, { "name": "seld/jsonlint", - "version": "1.8.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd" + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd", - "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", "shasum": "" }, "require": { @@ -15828,7 +15876,7 @@ "parser", "validator" ], - "time": "2020-08-13T09:07:59+00:00" + "time": "2020-04-30T19:05:18+00:00" }, { "name": "seld/phar-utils", @@ -15876,16 +15924,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.6", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", - "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -15923,7 +15971,7 @@ "phpcs", "standards" ], - "time": "2020-08-10T04:50:15+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/browser-kit", diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 08ed15c88..91b09d2af 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -6,6 +6,7 @@ module: block: 0 block_blacklist: 0 block_content: 0 + block_content_permissions: 0 book: 0 breakpoint: 0 chosen: 0 diff --git a/config/sync/user.role.admin_user.yml b/config/sync/user.role.admin_user.yml index 863007afe..262f49fe7 100644 --- a/config/sync/user.role.admin_user.yml +++ b/config/sync/user.role.admin_user.yml @@ -73,11 +73,17 @@ permissions: - 'bypass file access' - 'bypass node access' - 'clear mas_rss_feeds feeds' + - 'create accordion_menu block content' - 'create and edit custom blocks' - 'create application content' - 'create article content' - 'create audio media' + - 'create banner_deep block content' - 'create book content' + - 'create card_deck_plain block content' + - 'create card_plain block content' + - 'create card_standard block content' + - 'create card_wide block content' - 'create consultation content' - 'create contact content' - 'create department_management content' @@ -109,14 +115,21 @@ permissions: - 'create umbrella_body content' - 'create url aliases' - 'create video media' + - 'create video_and_caption block content' - 'create webform content' - 'delete all gp revisions' - 'delete all webform submissions' + - 'delete any accordion_menu block content' - 'delete any application content' - 'delete any article content' - 'delete any audio files' - 'delete any audio media' + - 'delete any banner_deep block content' - 'delete any book content' + - 'delete any card_deck_plain block content' + - 'delete any card_plain block content' + - 'delete any card_standard block content' + - 'delete any card_wide block content' - 'delete any consultation content' - 'delete any contact content' - 'delete any department_management content' @@ -146,6 +159,7 @@ permissions: - 'delete any umbrella_body content' - 'delete any video files' - 'delete any video media' + - 'delete any video_and_caption block content' - 'delete any webform content' - 'delete application revisions' - 'delete article revisions' @@ -349,6 +363,12 @@ permissions: - 'unflag home_page_display' - 'unflag show_listing' - 'unlock mas_rss_feeds feeds' + - 'update any accordion_menu block content' + - 'update any banner_deep block content' + - 'update any card_plain block content' + - 'update any card_standard block content' + - 'update any card_wide block content' + - 'update any video_and_caption block content' - 'use editorial transition create_new_draft' - 'use editorial transition publish' - 'use editorial transition quick_publish' diff --git a/config/sync/user.role.editor_user.yml b/config/sync/user.role.editor_user.yml index 7720a7a13..60828f660 100644 --- a/config/sync/user.role.editor_user.yml +++ b/config/sync/user.role.editor_user.yml @@ -36,11 +36,17 @@ permissions: - 'audit content' - 'clear mas_rss_feeds feeds' - 'configure editable landing_page node layout overrides' + - 'create accordion_menu block content' - 'create and edit custom blocks' - 'create application content' - 'create article content' - 'create audio media' + - 'create banner_deep block content' - 'create book content' + - 'create card_deck_plain block content' + - 'create card_plain block content' + - 'create card_standard block content' + - 'create card_wide block content' - 'create consultation content' - 'create contact content' - 'create department_management content' @@ -72,12 +78,19 @@ permissions: - 'create umbrella_body content' - 'create url aliases' - 'create video media' + - 'create video_and_caption block content' - 'delete all gp revisions' + - 'delete any accordion_menu block content' - 'delete any application content' - 'delete any article content' - 'delete any audio files' - 'delete any audio media' + - 'delete any banner_deep block content' - 'delete any book content' + - 'delete any card_deck_plain block content' + - 'delete any card_plain block content' + - 'delete any card_standard block content' + - 'delete any card_wide block content' - 'delete any consultation content' - 'delete any contact content' - 'delete any department_management content' @@ -107,6 +120,7 @@ permissions: - 'delete any umbrella_body content' - 'delete any video files' - 'delete any video media' + - 'delete any video_and_caption block content' - 'delete application revisions' - 'delete article revisions' - 'delete contact revisions' @@ -286,6 +300,12 @@ permissions: - 'unflag promote_to_all_pages' - 'unflag show_listing' - 'unlock mas_rss_feeds feeds' + - 'update any accordion_menu block content' + - 'update any banner_deep block content' + - 'update any card_plain block content' + - 'update any card_standard block content' + - 'update any card_wide block content' + - 'update any video_and_caption block content' - 'use editorial transition create_new_draft' - 'use editorial transition publish' - 'use editorial transition quick_publish' diff --git a/config/sync/views.view.block_content.yml b/config/sync/views.view.block_content.yml index 9f432e7b4..b29289910 100644 --- a/config/sync/views.view.block_content.yml +++ b/config/sync/views.view.block_content.yml @@ -24,7 +24,7 @@ display: access: type: perm options: - perm: 'administer blocks' + perm: 'create and edit custom blocks' cache: type: tag options: { } From 1779394d16c405f14436485e2d92e83cb574e23c Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Tue, 25 Aug 2020 14:46:05 +0100 Subject: [PATCH 3/5] D8NID-847 theme page content array adjustments (#410) * Add full display mode to present summary and description fields on theme terms * Retain footer text in content array for use in template --- ...display.taxonomy_term.site_themes.full.yml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 config/sync/core.entity_view_display.taxonomy_term.site_themes.full.yml diff --git a/config/sync/core.entity_view_display.taxonomy_term.site_themes.full.yml b/config/sync/core.entity_view_display.taxonomy_term.site_themes.full.yml new file mode 100644 index 000000000..87a4d0eb3 --- /dev/null +++ b/config/sync/core.entity_view_display.taxonomy_term.site_themes.full.yml @@ -0,0 +1,61 @@ +uuid: f5611ff8-b82e-47ce-b045-6ff4868a51ae +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.taxonomy_term.full + - field.field.taxonomy_term.site_themes.field_additional_info + - field.field.taxonomy_term.site_themes.field_banner_image + - field.field.taxonomy_term.site_themes.field_meta_tags + - field.field.taxonomy_term.site_themes.field_photo + - field.field.taxonomy_term.site_themes.field_supplementary_parents + - field.field.taxonomy_term.site_themes.field_taxonomy_rank + - field.field.taxonomy_term.site_themes.field_teaser + - field.field.taxonomy_term.site_themes.field_theme_summary + - field.field.taxonomy_term.site_themes.field_toc_enable + - field.field.taxonomy_term.site_themes.field_top_level_theme + - taxonomy.vocabulary.site_themes + module: + - layout_builder + - text +third_party_settings: + layout_builder: + allow_custom: false + enabled: false +id: taxonomy_term.site_themes.full +targetEntityType: taxonomy_term +bundle: site_themes +mode: full +content: + description: + label: hidden + type: text_default + weight: 1 + region: content + settings: { } + third_party_settings: { } + field_additional_info: + type: text_default + weight: 2 + region: content + label: hidden + settings: { } + third_party_settings: { } + field_theme_summary: + weight: 0 + label: hidden + settings: { } + third_party_settings: { } + type: text_default + region: content +hidden: + field_banner_image: true + field_meta_tags: true + field_photo: true + field_supplementary_parents: true + field_taxonomy_rank: true + field_teaser: true + field_toc_enable: true + field_top_level_theme: true + langcode: true + search_api_excerpt: true From 8c867e65d426b12ff9dbae57495beb7f28bb2fca Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Tue, 25 Aug 2020 15:53:07 +0100 Subject: [PATCH 4/5] Check out the edge branch for nightly functional testing (#409) --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65d69c4d5..a0c92730e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -272,6 +272,11 @@ jobs: - image: circleci/php:7.3.14-apache-browsers steps: - checkout_code + - run: + name: Checkout edge branch + command: | + cd ~/project + git checkout -b $EDGE_BUILD_BRANCH - install_php_os_extensions - run: name: Add extra OS and PHP extensions/config From bd6c83f8071fdbfa6c62934d15107ddbd391ae1e Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Wed, 26 Aug 2020 14:34:01 +0100 Subject: [PATCH 5/5] Sprint 10 release 2 --- composer.json | 10 +++++----- composer.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/composer.json b/composer.json index b165ef935..0b56ac425 100644 --- a/composer.json +++ b/composer.json @@ -32,12 +32,12 @@ "require": { "composer/installers": "^1.2", "cweagans/composer-patches": "^1.6.5", - "dof-dss/nicsdru_nidirect_theme": "^0.10.1", - "dof-dss/nicsdru_origins_modules": "^0.7.0", - "dof-dss/nicsdru_origins_theme": "0.3.1", + "dof-dss/nicsdru_nidirect_theme": "^0.10.2", + "dof-dss/nicsdru_origins_modules": "^0.8.0", + "dof-dss/nicsdru_origins_theme": "^0.3.1", "dof-dss/nidirect-d8-test-install-profile": "^0.2.2", - "dof-dss/nidirect-migrations": "0.10.1", - "dof-dss/nidirect-site-modules": "^0.10.1", + "dof-dss/nidirect-migrations": "^0.10.0", + "dof-dss/nidirect-site-modules": "^0.10.2", "drupal/address": "^1.7", "drupal/admin_toolbar": "^2.0", "drupal/adminimal_theme": "^1.5", diff --git a/composer.lock b/composer.lock index 34b3aba12..b452208ea 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": "4550ae17a7ff7eebc963eadecdd339ef", + "content-hash": "4cb1df6ac5ff58ffe3d0fd682f74b6a2", "packages": [ { "name": "alchemy/zippy", @@ -1891,16 +1891,16 @@ }, { "name": "dof-dss/nicsdru_nidirect_theme", - "version": "0.10.1", + "version": "0.10.2", "source": { "type": "git", "url": "https://github.com/dof-dss/nicsdru_nidirect_theme.git", - "reference": "38c01eece5f2b698ceeb928328c4cc0fa273c578" + "reference": "b0ea7b753c4ba70238be996a004e99313f4d1f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/nicsdru_nidirect_theme/zipball/38c01eece5f2b698ceeb928328c4cc0fa273c578", - "reference": "38c01eece5f2b698ceeb928328c4cc0fa273c578", + "url": "https://api.github.com/repos/dof-dss/nicsdru_nidirect_theme/zipball/b0ea7b753c4ba70238be996a004e99313f4d1f68", + "reference": "b0ea7b753c4ba70238be996a004e99313f4d1f68", "shasum": "" }, "require": { @@ -1923,20 +1923,20 @@ "drupal", "theme" ], - "time": "2020-08-19T13:51:40+00:00" + "time": "2020-08-26T13:23:10+00:00" }, { "name": "dof-dss/nicsdru_origins_modules", - "version": "0.7.0", + "version": "0.8.0", "source": { "type": "git", "url": "https://github.com/dof-dss/nicsdru_origins_modules.git", - "reference": "116b2801ce19b6c15474b8b33eee856d276adec4" + "reference": "49f8ae09c7fb47fc8eabc70fc258cfdc05fc737e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/nicsdru_origins_modules/zipball/116b2801ce19b6c15474b8b33eee856d276adec4", - "reference": "116b2801ce19b6c15474b8b33eee856d276adec4", + "url": "https://api.github.com/repos/dof-dss/nicsdru_origins_modules/zipball/49f8ae09c7fb47fc8eabc70fc258cfdc05fc737e", + "reference": "49f8ae09c7fb47fc8eabc70fc258cfdc05fc737e", "shasum": "" }, "require": { @@ -1948,7 +1948,7 @@ "MIT" ], "description": "Generic modules for DOF-DSS Drupal sites", - "time": "2020-08-19T13:47:46+00:00" + "time": "2020-08-26T13:26:17+00:00" }, { "name": "dof-dss/nicsdru_origins_theme", @@ -2016,16 +2016,16 @@ }, { "name": "dof-dss/nidirect-migrations", - "version": "0.10.1", + "version": "0.10.2", "source": { "type": "git", "url": "https://github.com/dof-dss/nidirect-d8-mig-mods.git", - "reference": "f76b1b168cd4e228009606d1daf704969f1607e6" + "reference": "53c5906be0810f8f76352f42b49e79e86c62ffee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/nidirect-d8-mig-mods/zipball/f76b1b168cd4e228009606d1daf704969f1607e6", - "reference": "f76b1b168cd4e228009606d1daf704969f1607e6", + "url": "https://api.github.com/repos/dof-dss/nidirect-d8-mig-mods/zipball/53c5906be0810f8f76352f42b49e79e86c62ffee", + "reference": "53c5906be0810f8f76352f42b49e79e86c62ffee", "shasum": "" }, "require": { @@ -2037,20 +2037,20 @@ "MIT" ], "description": "Drupal Migrate API modules for NI Direct", - "time": "2020-08-07T15:21:23+00:00" + "time": "2020-08-24T14:25:37+00:00" }, { "name": "dof-dss/nidirect-site-modules", - "version": "0.10.1", + "version": "0.10.2", "source": { "type": "git", "url": "https://github.com/dof-dss/nidirect-site-modules.git", - "reference": "8e822cb8a0b2ee072234b9eda01ade652109e1af" + "reference": "5fd32aaa24db50f841d015fa66b440a8f9e52dee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dof-dss/nidirect-site-modules/zipball/8e822cb8a0b2ee072234b9eda01ade652109e1af", - "reference": "8e822cb8a0b2ee072234b9eda01ade652109e1af", + "url": "https://api.github.com/repos/dof-dss/nidirect-site-modules/zipball/5fd32aaa24db50f841d015fa66b440a8f9e52dee", + "reference": "5fd32aaa24db50f841d015fa66b440a8f9e52dee", "shasum": "" }, "require": { @@ -2063,7 +2063,7 @@ "MIT" ], "description": "Drupal modules to provide custom code for NI Direct", - "time": "2020-08-19T10:15:56+00:00" + "time": "2020-08-25T10:27:56+00:00" }, { "name": "drupal/address",