From 2fb9af43b29fcae4e181f1ded614ab7c38f9780c Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 17 Feb 2021 15:21:17 +0100 Subject: [PATCH] patched flag_lists --- composer.json | 8 +++++--- composer.lock | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 1e40df0..f7eb94a 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,7 @@ "drupal/error_log": "^1.0", "drupal/field_group": "3.x-dev@dev", "drupal/field_permissions": "^1.0", + "drupal/flag": "4.x-dev@dev", "drupal/flag_lists": "4.0.x-dev@dev", "drupal/flood_control": "^2.1", "drupal/genpass": "^1.x-dev", @@ -151,9 +152,7 @@ }, "patches": { "drupal/core": { - "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch" - }, - "drupal/core": { + "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch", "language negociation exeption https://www.drupal.org/project/drupal/issues/3134349" : "https://www.drupal.org/files/issues/2020-06-02/3134349-9.patch" }, "drupal/email_registration": { @@ -165,6 +164,9 @@ }, "drupal/stripe": { "Stripe is a web service and should be in system.admin_config_services https://www.drupal.org/project/stripe/issues/3090652": "https://www.drupal.org/files/issues/2020-01-08/stripe-link_menu_in_services-3090652-5.patch" + }, + "drupal/flag_lists": { + "webprofiler ConfigEntityStorageDecorator given https://www.drupal.org/project/flag_lists/issues/3198936": "https://www.drupal.org/files/issues/2021-02-17/entitystorageinterface.patch" } }, "drupal-scaffold": { diff --git a/composer.lock b/composer.lock index bd96e69..929916b 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": "4ae0e6d641e8d1d36c0a937c08435bad", + "content-hash": "abb189a7f9edd2727c2d1c13a2a2e7c6", "packages": [ { "name": "alchemy/zippy", @@ -7349,29 +7349,26 @@ }, { "name": "drupal/flag", - "version": "4.0.0-beta2", + "version": "dev-4.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag.git", - "reference": "8.x-4.0-beta2" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta2.zip", - "reference": "8.x-4.0-beta2", - "shasum": "6f180b6f65e0e778e6fccebd07de9f9c689f6a1f" + "reference": "adbaab83407641dc52198e7e656ce20db03207a7" }, "require": { "drupal/core": "^8.8 || ^9" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-4.x": "4.x-dev" + }, "drupal": { - "version": "8.x-4.0-beta2", - "datestamp": "1595273815", + "version": "8.x-4.0-beta2+1-dev", + "datestamp": "1596783981", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -7421,7 +7418,8 @@ "homepage": "https://www.drupal.org/project/flag", "support": { "source": "https://git.drupalcode.org/project/flag" - } + }, + "time": "2020-08-07T07:05:58+00:00" }, { "name": "drupal/flag_lists", @@ -19097,6 +19095,7 @@ "drupal/computed_field": 10, "drupal/content_sync": 20, "drupal/field_group": 20, + "drupal/flag": 20, "drupal/flag_lists": 20, "drupal/genpass": 20, "drupal/graphql": 20,