diff --git a/composer.json b/composer.json
index 88fd03e..a830d2d 100644
--- a/composer.json
+++ b/composer.json
@@ -76,6 +76,7 @@
"drupal/recurring_period": "^1.0",
"drupal/redis": "^1.5",
"drupal/restui": "^1.16",
+ "drupal/role_delegation": "^1.1",
"drupal/search_api": "^1.19",
"drupal/search_api_autocomplete": "^1.2",
"drupal/search_api_page": "^1.x-dev",
diff --git a/composer.lock b/composer.lock
index 785894b..3598fc7 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": "9884ef28d3552ecea822e773780aeb5e",
+ "content-hash": "5f6a4267f5f2366f8b0c1e069383160d",
"packages": [
{
"name": "alchemy/zippy",
@@ -2867,26 +2867,26 @@
},
{
"name": "drupal/advanced_text_formatter",
- "version": "1.0.0",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/advanced_text_formatter.git",
- "reference": "8.x-1.0"
+ "reference": "2.0.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/advanced_text_formatter-8.x-1.0.zip",
- "reference": "8.x-1.0",
- "shasum": "406e6d86ea617bcdeea1565fdbd6354a75448adf"
+ "url": "https://ftp.drupal.org/files/projects/advanced_text_formatter-2.0.0.zip",
+ "reference": "2.0.0",
+ "shasum": "ecd1d0e46dfc137251f9b71e724c6edddd5c48df"
},
"require": {
- "drupal/core": "^8"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0",
- "datestamp": "1557589686",
+ "version": "2.0.0",
+ "datestamp": "1591030704",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4422,7 +4422,7 @@
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/commerce_pricelist.git",
- "reference": "4ca45e6c6e0295c7acf2e3790f47d982c2eeb2b6"
+ "reference": "119440f888c0e2859f9fd086cb72698404660753"
},
"require": {
"drupal/commerce": "^2.16",
@@ -4436,8 +4436,8 @@
"dev-2.x": "2.x-dev"
},
"drupal": {
- "version": "8.x-2.1+0-dev",
- "datestamp": "1605612169",
+ "version": "8.x-2.1+1-dev",
+ "datestamp": "1605699877",
"security-coverage": {
"status": "not-covered",
"message": "Dev releases are not covered by Drupal security advisories."
@@ -11205,6 +11205,56 @@
"source": "https://git.drupalcode.org/project/restui"
}
},
+ {
+ "name": "drupal/role_delegation",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/role_delegation.git",
+ "reference": "8.x-1.1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/role_delegation-8.x-1.1.zip",
+ "reference": "8.x-1.1",
+ "shasum": "a63b548056cc729beacfd385625fafb983e0f73e"
+ },
+ "require": {
+ "drupal/core": "^8 || ^9"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "8.x-1.1",
+ "datestamp": "1580498751",
+ "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": "Jeroen Tubex",
+ "homepage": "https://www.drupal.org/u/jeroent",
+ "role": "Maintainer"
+ },
+ {
+ "name": "benjy",
+ "homepage": "https://www.drupal.org/user/1852732"
+ }
+ ],
+ "description": "Allows site administrators to grant some roles the authority to assign selected roles to users.",
+ "homepage": "http://drupal.org/project/role_delegation",
+ "support": {
+ "source": "https://git.drupalcode.org/project/role_delegation",
+ "issues": "http://drupal.org/project/role_delegation"
+ }
+ },
{
"name": "drupal/search_api",
"version": "1.19.0",
@@ -20596,7 +20646,6 @@
"drupal/ultimate_cron": 20,
"drupal/user_email_verification": 20,
"drupal/views_conditional": 20,
- "drupal/advanced_text_formatter": 10,
"drupal/autocomplete_deluxe": 5,
"drupal/better_exposed_filters": 10,
"drupal/better_messages": 15,
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index 8db12df..1d8e75c 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -165,6 +165,7 @@ module:
responsive_image: 0
rest: 0
restui: 0
+ role_delegation: 0
search_api: 0
search_api_db: 0
search_api_solr: 0
diff --git a/config/sync/language/fr/eu_cookie_compliance.settings.yml b/config/sync/language/fr/eu_cookie_compliance.settings.yml
index d396fca..18165ec 100644
--- a/config/sync/language/fr/eu_cookie_compliance.settings.yml
+++ b/config/sync/language/fr/eu_cookie_compliance.settings.yml
@@ -4,10 +4,11 @@ popup_agree_button_message: Accepter
popup_more_info_button_message: 'En savoir plus'
popup_find_more_button_message: 'En savoir plus'
popup_hide_button_message: Masquer
+popup_info:
+ value: 'Nous utilisons des cookies pour vous offrir la meilleure expérience sur notre site Web. Si vous continuez à utiliser ce site, nous supposerons que vous en êtes satisfait.'
+popup_link: /privacy-policy
disagree_button_label: 'Non, merci.'
withdraw_message:
value: 'Nous utilisons des cookies sur ce site pour améliorer votre expérience d''utilisateur.
Vous avez consenti à l''ajout de cookies.
'
withdraw_action_button_label: 'Retirer le consentement'
withdraw_tab_button_label: 'Paramètres de confidentialité'
-popup_info:
- value: 'Nous utilisons des cookies pour vous offrir la meilleure expérience sur notre site Web. Si vous continuez à utiliser ce site, nous supposerons que vous en êtes satisfait.'
diff --git a/config/sync/language/fr/webform.webform.contact.yml b/config/sync/language/fr/webform.webform.contact.yml
index 0346d15..603ea56 100644
--- a/config/sync/language/fr/webform.webform.contact.yml
+++ b/config/sync/language/fr/webform.webform.contact.yml
@@ -1,3 +1,4 @@
title: Contact
settings:
confirmation_message: 'Votre message a été envoyé.'
+ confirmation_url: /privacy-policy
diff --git a/config/sync/user.role.admin.yml b/config/sync/user.role.admin.yml
index a7482cc..5b4e613 100644
--- a/config/sync/user.role.admin.yml
+++ b/config/sync/user.role.admin.yml
@@ -32,6 +32,13 @@ permissions:
- 'administer simplenews subscriptions'
- 'administer synonyms'
- 'administer users'
+ - 'assign adherent role'
+ - 'assign admin role'
+ - 'assign admin_showroom role'
+ - 'assign alpha_testeur role'
+ - 'assign contact_company role'
+ - 'assign student role'
+ - 'assign translator role'
- 'break content lock'
- 'cancel any commerce_subscription'
- 'change own username'