diff --git a/composer.json b/composer.json index c228e31..c63763b 100644 --- a/composer.json +++ b/composer.json @@ -145,7 +145,7 @@ "drupal/search_api_solr": "^4.0", "drupal/select_translation": "^1.x-dev", "drupal/session_limit": "^2.0@beta", - "drupal/simplenews": "^2.0@beta", + "drupal/simplenews": "3.x-dev@dev", "drupal/social_media_links": "^2.8", "drupal/string_translation_ui": "^1.2", "drupal/strings_i18n_json_export": "^1.x-dev@dev", diff --git a/composer.lock b/composer.lock index 8b5244e..0752567 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": "a808d63475be94aec05c20382d5d1132", + "content-hash": "28c5d047d6b22eec98aba7c5c09e2978", "packages": [ { "name": "alchemy/zippy", @@ -12667,32 +12667,29 @@ }, { "name": "drupal/simplenews", - "version": "2.0.0-beta2", + "version": "dev-3.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simplenews.git", - "reference": "8.x-2.0-beta2" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simplenews-8.x-2.0-beta2.zip", - "reference": "8.x-2.0-beta2", - "shasum": "e33699acad01501ff6a8fc474a53e7ca45244f83" + "reference": "94a103090d0f58929db8035ef0436912a1b59ba9" }, "require": { "drupal/core": "^8.8 || ^9" }, "require-dev": { - "drupal/monitoring": "*" + "drupal/monitoring": "^1.10" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-3.x": "3.x-dev" + }, "drupal": { - "version": "8.x-2.0-beta2", - "datestamp": "1592298547", + "version": "3.x-dev", + "datestamp": "1648060687", "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." } } }, @@ -12726,7 +12723,7 @@ "homepage": "https://www.drupal.org/user/227761" } ], - "description": "Send newsletters to subscribed email addresses. For uninstall go to Configuration > Web services > Simplenews > Settings and hit \"Prepare uninstall\".", + "description": "Simplenews publishes and sends newsletters to lists of subscribers", "homepage": "https://www.drupal.org/project/simplenews", "support": { "source": "https://git.drupalcode.org/project/simplenews" @@ -25092,7 +25089,7 @@ "drupal/search_api_page": 20, "drupal/select_translation": 20, "drupal/session_limit": 10, - "drupal/simplenews": 10, + "drupal/simplenews": 20, "drupal/strings_i18n_json_export": 20, "drupal/swiftmailer": 20, "drupal/telephone_formatter": 10, diff --git a/config/sync/core.entity_view_display.node.simplenews_issue.email_textalt.yml b/config/sync/core.entity_view_display.node.simplenews_issue.email_textalt.yml deleted file mode 100644 index 3c41b2f..0000000 --- a/config/sync/core.entity_view_display.node.simplenews_issue.email_textalt.yml +++ /dev/null @@ -1,30 +0,0 @@ -uuid: 6e5a75a4-cf9b-4b8c-bf00-dbde3b42dcb2 -langcode: en -status: true -dependencies: - config: - - core.entity_view_mode.node.email_textalt - - field.field.node.simplenews_issue.body - - field.field.node.simplenews_issue.simplenews_issue - - node.type.simplenews_issue - module: - - text - - user -_core: - default_config_hash: nbS6YErkrJfcf1Lgbd-MEFDZvatGhf9ZYEdg7_phgRU -id: node.simplenews_issue.email_textalt -targetEntityType: node -bundle: simplenews_issue -mode: email_textalt -content: - body: - type: text_default - label: hidden - settings: { } - third_party_settings: { } - weight: 0 - region: content -hidden: - langcode: true - links: true - simplenews_issue: true diff --git a/config/sync/core.entity_view_mode.node.email_textalt.yml b/config/sync/core.entity_view_mode.node.email_textalt.yml deleted file mode 100644 index 368c2bc..0000000 --- a/config/sync/core.entity_view_mode.node.email_textalt.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: 8f2bb66b-0654-45b5-b4d7-1f44976cbb9f -langcode: en -status: false -dependencies: - module: - - node - enforced: - module: - - simplenews -_core: - default_config_hash: 3VUPDEGmxWyAGCr0U_RTGoPS3xmNiOj3NU0wy4vxgwI -id: node.email_textalt -label: 'Email: HTML text alternative' -targetEntityType: node -cache: true diff --git a/config/sync/simplenews.newsletter.companies.yml b/config/sync/simplenews.newsletter.companies.yml index fa2eddc..e084cc2 100644 --- a/config/sync/simplenews.newsletter.companies.yml +++ b/config/sync/simplenews.newsletter.companies.yml @@ -14,5 +14,5 @@ from_address: info@materio.com hyperlinks: true allowed_handlers: { } new_account: none -opt_inout: double +access: default weight: 0 diff --git a/config/sync/simplenews.newsletter.materio_newsletter.yml b/config/sync/simplenews.newsletter.materio_newsletter.yml index f226e41..13906dc 100644 --- a/config/sync/simplenews.newsletter.materio_newsletter.yml +++ b/config/sync/simplenews.newsletter.materio_newsletter.yml @@ -12,6 +12,7 @@ from_name: materiO’ subject: '[node:title]' from_address: info@materio.com hyperlinks: true +allowed_handlers: { } new_account: 'on' -opt_inout: double +access: default weight: 0 diff --git a/config/sync/simplenews.newsletter.test.yml b/config/sync/simplenews.newsletter.test.yml index eea26bb..38b316b 100644 --- a/config/sync/simplenews.newsletter.test.yml +++ b/config/sync/simplenews.newsletter.test.yml @@ -12,6 +12,7 @@ from_name: materiO’ subject: '[[simplenews-newsletter:name]] [node:title]' from_address: info@materio.com hyperlinks: true +allowed_handlers: { } new_account: none -opt_inout: double +access: default weight: 0 diff --git a/config/sync/simplenews.newsletter.ze_daily_materio_.yml b/config/sync/simplenews.newsletter.ze_daily_materio_.yml index e15e4a6..d925970 100644 --- a/config/sync/simplenews.newsletter.ze_daily_materio_.yml +++ b/config/sync/simplenews.newsletter.ze_daily_materio_.yml @@ -12,6 +12,7 @@ from_name: materiO’ subject: '[node:title]' from_address: info@materio.com hyperlinks: true +allowed_handlers: { } new_account: 'on' -opt_inout: double +access: default weight: 0 diff --git a/config/sync/simplenews.settings.yml b/config/sync/simplenews.settings.yml index f6ce864..d95ea34 100644 --- a/config/sync/simplenews.settings.yml +++ b/config/sync/simplenews.settings.yml @@ -2,6 +2,7 @@ _core: default_config_hash: cy-hJPYCnfCsuUZA7VDoAwssKhRJCa8N88iJTaWiims hash_expiration: 86400 newsletter: + issue_tokens: false format: html priority: 3 receipt: false @@ -10,27 +11,18 @@ newsletter: subscriber: sync_fields: true subscription: + skip_verification: false tidy_unconfirmed: 0 - use_combined: multiple - confirm_subscribe_subject: 'Confirmation for [simplenews-newsletter:name] from [site:name]' - confirm_subscribe_unsubscribed: |- - We have received a request to subscribe [simplenews-subscriber:mail] to the [simplenews-newsletter:name] newsletter on [site:name] website at [site:url]. To confirm please use the link below. - - [simplenews-subscriber:subscribe-url] - confirm_subscribe_subscribed: 'We have received a request to subscribe [simplenews-subscriber:mail] to the [simplenews-newsletter:name] newsletter on [site:name] website at [site:url]. However, this email is already subscribed to this newsletter. If you intended to unsubscribe please visit our site: [site:url]' - confirm_unsubscribe_subscribed: "We have received a request to remove the [simplenews-subscriber:mail] from the [simplenews-newsletter:name] mailing list on [site:name] website at [site:url]. To confirm please use the link below.\r\n\r\n[simplenews-subscriber:unsubscribe-url]" - confirm_unsubscribe_unsubscribed: 'We have received a request to remove the [simplenews-subscriber:mail] from the [simplenews-newsletter:name] mailing list on [site:name] website at [site:url]. However, this email is not subscribed to this mailing list. If you intended to subscribe please visit our site at [site:url]' confirm_combined_subject: 'Confirmation for [site:name]' - confirm_combined_body: "We have received a request for the following subscription changes for [simplenews-subscriber:mail] at [site:url]:\r\n\r\n[changes-list]\r\n\r\nTo confirm please use the link below.\r\n\r\n[simplenews-subscriber:combined-url]" - confirm_combined_body_unchanged: "We have received a request for the following subscription changes for [simplenews-subscriber:mail] at [site:url]:\r\n\r\n[changes-list]\r\n\r\nNo confirmation necessary because all requested changes equal the current state." - confirm_combined_line_subscribe_unsubscribed: 'Subscribe to [simplenews-newsletter:name]' - confirm_combined_line_subscribe_subscribed: 'Already subscribed to [simplenews-newsletter:name]' - confirm_combined_line_unsubscribe_subscribed: 'Unsubscribe from [simplenews-newsletter:name]' - confirm_combined_line_unsubscribe_unsubscribed: 'Already unsubscribed from [simplenews-newsletter:name]' + confirm_combined_body: "We have received a request to subscribe [simplenews-subscriber:mail] at [site:url]. To confirm please use the link below.\r\n\r\n[simplenews-subscriber:combined-url]" + confirm_combined_body_unchanged: 'We have received a request to subscribe [simplenews-subscriber:mail] at [site:url]. No confirmation necessary because you are already subscribed.' confirm_subscribe_page: '' confirm_unsubscribe_page: '' + validate_subject: 'Manage your subscriptions at [site:name]' + validate_body: "We have received a request to manage your subscriptions for [simplenews-subscriber:mail] at [site:url]. To proceed please use the link below.\r\n\r\n[simplenews-subscriber:manage-url]" mail: use_cron: true + textalt: true throttle: 200 spool_progress_expiration: 3600 spool_expire: 1