Selaa lähdekoodia

Merge branch 'prod'

bach 2 vuotta sitten
vanhempi
commit
685d2dbcbd
2 muutettua tiedostoa jossa 106 lisäystä ja 10 poistoa
  1. 1 2
      composer.json
  2. 105 8
      composer.lock

+ 1 - 2
composer.json

@@ -270,11 +270,10 @@
               "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/commerce_license": {
-              "expected argument of type array or Traversable and ArrayAccess, string given https://www.drupal.org/project/commerce_license/issues/3252431":"https://www.drupal.org/files/issues/2021-12-03/commerce_license-expected-argument-of-type-array-3252431-1.patch",
               "ability to re-purchase a license to extend it https://www.drupal.org/project/commerce_license/issues/2943888": "https://www.drupal.org/files/issues/2022-02-21/reroll-commerce_license-allow-renewal-2943888-141.patch"
             },
             "drupal/commerce_stripe" : {
-              "Allow off_session payment intents for recurring payments https://www.drupal.org/project/commerce_stripe/issues/3171408": "https://www.drupal.org/files/issues/2021-10-04/commerce_stripe-allow-off_session-payment-intents-for-recurring-payments-3171408-34.patch"
+              "Allow off_session payment intents for recurring payments https://www.drupal.org/project/commerce_stripe/issues/3171408": "https://www.drupal.org/files/issues/2022-11-01/commerce_stripe-off-session-payments-3171408-59.patch"
             },
             "drupal/address": {
               "Integrate Address with Search API https://www.drupal.org/project/address/issues/2812659": "https://www.drupal.org/files/issues/2020-11-02/integrate-address-searchapi-2812659-56.patch"

+ 105 - 8
composer.lock

@@ -3823,28 +3823,125 @@
                 "issues": "https://www.drupal.org/project/issues/checklistapi"
             }
         },
+        {
+            "name": "drupal/ckeditor",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/ckeditor.git",
+                "reference": "1.0.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/ckeditor-1.0.1.zip",
+                "reference": "1.0.1",
+                "shasum": "d3dd8bfb2301b749599ba48cf76208becdf0eeb3"
+            },
+            "require": {
+                "drupal/core": "^9.4 || ^10"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "1.0.1",
+                    "datestamp": "1662977541",
+                    "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": "dczepierga",
+                    "homepage": "https://www.drupal.org/user/911466"
+                },
+                {
+                    "name": "hass",
+                    "homepage": "https://www.drupal.org/user/85918"
+                },
+                {
+                    "name": "jcisio",
+                    "homepage": "https://www.drupal.org/user/210762"
+                },
+                {
+                    "name": "Jorrit",
+                    "homepage": "https://www.drupal.org/user/161217"
+                },
+                {
+                    "name": "lauriii",
+                    "homepage": "https://www.drupal.org/user/1078742"
+                },
+                {
+                    "name": "Magnus",
+                    "homepage": "https://www.drupal.org/user/73919"
+                },
+                {
+                    "name": "mkesicki",
+                    "homepage": "https://www.drupal.org/user/922884"
+                },
+                {
+                    "name": "nod_",
+                    "homepage": "https://www.drupal.org/user/598310"
+                },
+                {
+                    "name": "p.wiaderny",
+                    "homepage": "https://www.drupal.org/user/2956619"
+                },
+                {
+                    "name": "vokiel",
+                    "homepage": "https://www.drupal.org/user/2793801"
+                },
+                {
+                    "name": "Wim Leers",
+                    "homepage": "https://www.drupal.org/user/99777"
+                },
+                {
+                    "name": "wwalc",
+                    "homepage": "https://www.drupal.org/user/184556"
+                },
+                {
+                    "name": "xjm",
+                    "homepage": "https://www.drupal.org/user/65776"
+                }
+            ],
+            "description": "WYSIWYG editing for rich text fields using CKEditor.",
+            "homepage": "https://www.drupal.org/project/ckeditor",
+            "support": {
+                "source": "https://git.drupalcode.org/project/ckeditor"
+            }
+        },
         {
             "name": "drupal/ckeditor_codemirror",
-            "version": "2.3.0",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/ckeditor_codemirror.git",
-                "reference": "8.x-2.3"
+                "reference": "8.x-2.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/ckeditor_codemirror-8.x-2.3.zip",
-                "reference": "8.x-2.3",
-                "shasum": "dfb00a0ec44953846d689d1e72f40e4201c8a355"
+                "url": "https://ftp.drupal.org/files/projects/ckeditor_codemirror-8.x-2.4.zip",
+                "reference": "8.x-2.4",
+                "shasum": "8909e59baaf1dd8f899c617559ed7807f07d6307"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9"
+                "drupal/ckeditor": "*",
+                "drupal/core": "^8.8 || ^9.0"
+            },
+            "require-dev": {
+                "drupal/coder": "^8.3",
+                "phpcompatibility/php-compatibility": "10.x-dev"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.3",
-                    "datestamp": "1586020798",
+                    "version": "8.x-2.4",
+                    "datestamp": "1654635495",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"