diff --git a/composer.json b/composer.json index 7dfe0ff9..ad06fce2 100644 --- a/composer.json +++ b/composer.json @@ -301,12 +301,7 @@ "drupal/structure_sync": { "With no blocks, clicking on the Custom Blocks tab crashes site https://www.drupal.org/project/structure_sync/issues/3070414":"https://www.drupal.org/files/issues/2022-03-23/PluginNotFoundException-3070414-3.patch" }, - "drupal/simplenews": { - "Spamassassin points because of using X-MSMail-Priority header without X-MimeOLE":"https://www.drupal.org/files/issues/2022-05-04/msmail-priority-header-without-x-mimeole_2072779%239.patch" - }, "drupal/simplenews_mailjet_subscriptions": { - "var_dump https://www.drupal.org/project/simplenews_mailjet_subscriptions/issues/3280822#comment-14517416":"https://www.drupal.org/files/issues/2022-05-17/3280822-vardump%231.patch", - "missing argument https://www.drupal.org/project/simplenews_mailjet_subscriptions/issues/3280825": "https://www.drupal.org/files/issues/2022-05-17/3280825-missing-argument%232.patch", "using mailjet module":"./patches/simplenews_mailjet_subscriptions__usingmailjetmodule.patch" }, "drupal/graphql": { diff --git a/composer.lock b/composer.lock index 52876316..e3b90f9d 100644 --- a/composer.lock +++ b/composer.lock @@ -6795,17 +6795,17 @@ }, { "name": "drupal/csv_serialization", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/csv_serialization.git", - "reference": "8.x-2.0" + "reference": "8.x-2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/csv_serialization-8.x-2.0.zip", - "reference": "8.x-2.0", - "shasum": "3531383a6926a4ed761be56553997c2a937449ac" + "url": "https://ftp.drupal.org/files/projects/csv_serialization-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "10b8629a5808ed1ecf358d5ca7054d6c14a476d4" }, "require": { "drupal/core": "^8 || ^9", @@ -6818,8 +6818,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0", - "datestamp": "1612801962", + "version": "8.x-2.1", + "datestamp": "1655054417", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8919,20 +8919,20 @@ }, { "name": "drupal/google_analytics", - "version": "4.0.0", + "version": "4.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/google_analytics.git", - "reference": "4.0.0" + "reference": "4.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/google_analytics-4.0.0.zip", - "reference": "4.0.0", - "shasum": "4f761d4c852d11966f7289b0eb6431cc8db27240" + "url": "https://ftp.drupal.org/files/projects/google_analytics-4.0.2.zip", + "reference": "4.0.2", + "shasum": "6deec511373e4659e42ff494c8729434728e37d7" }, "require": { - "drupal/core": "^8.9|^9.0" + "drupal/core": "^9.3 || ^10" }, "require-dev": { "drupal/token": "^1.7" @@ -8940,8 +8940,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0", - "datestamp": "1634230238", + "version": "4.0.2", + "datestamp": "1662768595", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12997,7 +12997,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/simplenews.git", - "reference": "34af0acbbdaed583b920e0ffe39b5b2c86ae7cad" + "reference": "474ed06894a95b09ab13abd015473dd2b607c4c2" }, "require": { "drupal/core": "^8.8 || ^9" @@ -13011,8 +13011,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "3.x-dev", - "datestamp": "1651142570", + "version": "3.0.0-beta3+1-dev", + "datestamp": "1666544109", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -13036,6 +13036,10 @@ "name": "Berdir", "homepage": "https://www.drupal.org/user/214652" }, + { + "name": "miro_dietiker", + "homepage": "https://www.drupal.org/user/227761" + }, { "name": "Simon Georges", "homepage": "https://www.drupal.org/user/172312" @@ -13043,10 +13047,6 @@ { "name": "Sutharsan", "homepage": "https://www.drupal.org/user/73854" - }, - { - "name": "miro_dietiker", - "homepage": "https://www.drupal.org/user/227761" } ], "description": "Simplenews publishes and sends newsletters to lists of subscribers", @@ -13061,10 +13061,10 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/simplenews_mailjet_subscriptions.git", - "reference": "4e64ff5fb58611e0c9cd8d5208ed18dd33226ce6" + "reference": "2104b76ebd4b69ae1f76c7741e343ba5edb8cba2" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^8 || ^9 || ^10", "drupal/simplenews": "*" }, "type": "drupal-module", @@ -13073,11 +13073,11 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.1+1-dev", - "datestamp": "1614340780", + "version": "8.x-1.2+2-dev", + "datestamp": "1662490918", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -13086,14 +13086,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "Miguelpamferreira", - "homepage": "https://www.drupal.org/user/3548054" - }, - { - "name": "Nelson Alves", - "homepage": "https://www.drupal.org/user/3557178" - }, { "name": "dgaspara", "homepage": "https://www.drupal.org/user/3557179" @@ -13102,10 +13094,22 @@ "name": "joaomarques736", "homepage": "https://www.drupal.org/user/3557181" }, + { + "name": "Miguelpamferreira", + "homepage": "https://www.drupal.org/user/3548054" + }, + { + "name": "nsalves", + "homepage": "https://www.drupal.org/user/3557178" + }, { "name": "ricardotenreiro", "homepage": "https://www.drupal.org/user/213132" }, + { + "name": "tiagopastor", + "homepage": "https://www.drupal.org/user/3656519" + }, { "name": "tmiguelv", "homepage": "https://www.drupal.org/user/3612421" diff --git a/config/sync/google_analytics.settings.yml b/config/sync/google_analytics.settings.yml index 7a564b8e..4671ed1b 100644 --- a/config/sync/google_analytics.settings.yml +++ b/config/sync/google_analytics.settings.yml @@ -1,7 +1,6 @@ _core: default_config_hash: goermvpa21m8H97TedFfQQmZmQz62WjX_SCiT4JhsXg account: UA-6530683-1 -premium: false domain_mode: 0 cross_domains: '' visibility: diff --git a/patches/simplenews_mailjet_subscriptions__usingmailjetmodule.patch b/patches/simplenews_mailjet_subscriptions__usingmailjetmodule.patch index 0cf72553..c8acc92e 100644 --- a/patches/simplenews_mailjet_subscriptions__usingmailjetmodule.patch +++ b/patches/simplenews_mailjet_subscriptions__usingmailjetmodule.patch @@ -1,3 +1,9 @@ +commit 6d9b6fde312fbe756115ba80656eea1861c4e4ce +Author: bach +Date: Wed Nov 2 20:57:17 2022 +0100 + + using mailjet module + diff --git a/README.txt b/README.txt index cee6e1a..b488e91 100644 --- a/README.txt @@ -10,15 +16,6 @@ index cee6e1a..b488e91 100644 INSTALLATION ------------ -diff --git a/simplenews_mailjet_subscriptions.info.yml b/simplenews_mailjet_subscriptions.info.yml -index 2512a39..d4b0440 100644 ---- a/simplenews_mailjet_subscriptions.info.yml -+++ b/simplenews_mailjet_subscriptions.info.yml -@@ -7,3 +7,4 @@ package: Mail - configure: simplenews_mailjet_subscription.list - dependencies: - - simplenews:simplenews -+ - mailjet:mailjet diff --git a/simplenews_mailjet_subscriptions.module b/simplenews_mailjet_subscriptions.module index 09abe13..a481713 100644 --- a/simplenews_mailjet_subscriptions.module