From 59322bf447e2f77e5f9d3fb834c0419d063232c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 15:36:38 -0400 Subject: [PATCH 01/18] Update to Drupal 8.6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3781c7a..2ba7c7b 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "drupal-composer/drupal-scaffold": "^2.0.0", "cweagans/composer-patches": "^1.0", "drutopia/drutopia": "^1.0-alpha7", - "drupal/core": "~8.5.0", + "drupal/core": "^8.6.0", "behat/behat": "^3.4", "drupal/drupal-extension": "^3.3", "behat/mink": "^1.7", From 903d97f1211fb4bfc69ebf856a2de0727f09d926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 15:36:49 -0400 Subject: [PATCH 02/18] Update composer lock file --- composer.lock | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index 60a64ff..8597958 100644 --- a/composer.lock +++ b/composer.lock @@ -2752,16 +2752,16 @@ }, { "name": "drupal/core", - "version": "8.5.6", + "version": "8.5.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "7d7184a69ac90ce53929ce99f18458043416107a" + "reference": "d8bdf376c0549e9bfc33030157b498df4b9bec87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/7d7184a69ac90ce53929ce99f18458043416107a", - "reference": "7d7184a69ac90ce53929ce99f18458043416107a", + "url": "https://api.github.com/repos/drupal/core/zipball/d8bdf376c0549e9bfc33030157b498df4b9bec87", + "reference": "d8bdf376c0549e9bfc33030157b498df4b9bec87", "shasum": "" }, "require": { @@ -2986,7 +2986,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2018-08-01T20:50:42+00:00" + "time": "2018-09-05T22:26:39+00:00" }, { "name": "drupal/ctools", @@ -7052,16 +7052,16 @@ }, { "name": "psy/psysh", - "version": "v0.9.7", + "version": "v0.9.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932" + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f5b6c090948773a8bfeea6a0f07ab7d0b24e932", - "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", "shasum": "" }, "require": { @@ -7122,7 +7122,7 @@ "interactive", "shell" ], - "time": "2018-08-11T15:54:43+00:00" + "time": "2018-09-05T11:40:09+00:00" }, { "name": "stack/builder", @@ -8965,16 +8965,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" + "reference": "20da13beba0dde8fb648be3cc19765732790f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", + "reference": "20da13beba0dde8fb648be3cc19765732790f46e", "shasum": "" }, "require": { @@ -8987,6 +8987,7 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", + "php-http/psr7-integration-tests": "dev-master", "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, @@ -9024,7 +9025,7 @@ "psr", "psr-7" ], - "time": "2018-08-10T14:16:32+00:00" + "time": "2018-09-05T19:29:37+00:00" }, { "name": "zendframework/zend-escaper", From 1677722bf97d6abd0ac8c2534465b9a80305c812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 15:39:10 -0400 Subject: [PATCH 03/18] Remove patch which David got committed --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 2ba7c7b..8cd9bd4 100644 --- a/composer.json +++ b/composer.json @@ -54,12 +54,6 @@ "drush/contrib/{$name}": [ "type:drupal-drush" ] - }, - "enable-patching": true, - "patches": { - "drupal/migrate_plus": { - "EntityLookup fatal error on config entity type": "https://www.drupal.org/files/issues/2933306-config_entity-2.patch" - } } }, "require-dev": { From 74b4a7bf3dd0ba964c5509011b3f35fe70269e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 15:41:36 -0400 Subject: [PATCH 04/18] Provide convenient local aliases --- drush/drushrc.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 drush/drushrc.php diff --git a/drush/drushrc.php b/drush/drushrc.php new file mode 100644 index 0000000..8a74de1 --- /dev/null +++ b/drush/drushrc.php @@ -0,0 +1,4 @@ + Date: Thu, 6 Sep 2018 15:56:56 -0400 Subject: [PATCH 05/18] Update composer lock file for 8.6 --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 8597958..a0b720c 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": "1804a963570ca7bd606fa234b9611581", + "content-hash": "09483f94aba3896055f37dec4472cde0", "packages": [ { "name": "asm89/stack-cors", @@ -2752,16 +2752,16 @@ }, { "name": "drupal/core", - "version": "8.5.7", + "version": "8.6.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "d8bdf376c0549e9bfc33030157b498df4b9bec87" + "reference": "4a2507b102fcedc74507fd372131f2ed72913429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/d8bdf376c0549e9bfc33030157b498df4b9bec87", - "reference": "d8bdf376c0549e9bfc33030157b498df4b9bec87", + "url": "https://api.github.com/repos/drupal/core/zipball/4a2507b102fcedc74507fd372131f2ed72913429", + "reference": "4a2507b102fcedc74507fd372131f2ed72913429", "shasum": "" }, "require": { @@ -2879,10 +2879,12 @@ "drupal/link": "self.version", "drupal/locale": "self.version", "drupal/media": "self.version", + "drupal/media_library": "self.version", "drupal/menu_link_content": "self.version", "drupal/menu_ui": "self.version", "drupal/migrate": "self.version", "drupal/migrate_drupal": "self.version", + "drupal/migrate_drupal_multilingual": "self.version", "drupal/migrate_drupal_ui": "self.version", "drupal/minimal": "self.version", "drupal/node": "self.version", @@ -2914,7 +2916,8 @@ "drupal/user": "self.version", "drupal/views": "self.version", "drupal/views_ui": "self.version", - "drupal/workflows": "self.version" + "drupal/workflows": "self.version", + "drupal/workspaces": "self.version" }, "require-dev": { "behat/mink": "1.7.x-dev", @@ -2925,7 +2928,7 @@ "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "mikey179/vfsstream": "^1.2", "phpspec/prophecy": "^1.4", - "phpunit/phpunit": "^4.8.35 || ^6.1", + "phpunit/phpunit": "^4.8.35 || ^6.5", "symfony/css-selector": "^3.4.0", "symfony/debug": "^3.4.0", "symfony/phpunit-bridge": "^3.4.3" @@ -2960,9 +2963,6 @@ "recurse": false, "replace": false, "merge-extra": false - }, - "patches_applied": { - "Datetime Range Views integration": "https://www.drupal.org/files/issues/2786577-270.patch" } }, "autoload": { @@ -2986,7 +2986,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2018-09-05T22:26:39+00:00" + "time": "2018-09-05T22:16:20+00:00" }, { "name": "drupal/ctools", From 63c4ecb5c0bb1d25fe48c0a2856767dbbe5f997d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 15:57:50 -0400 Subject: [PATCH 06/18] Add composer webform to Agaric's increasingly forked Drutopia base --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8cd9bd4..f07dd8c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "behat/mink-goutte-driver": "^1.2", "drush/drush": "^8.0", "drupal/migrate_tools": "^4.0", - "drupal/migrate_plus": "^4.0" + "drupal/migrate_plus": "^4.0", + "drupal/webform": "^5.0@RC" }, "repositories": { "drupal": { From ba7e02efac66260787f36e4023d6d35401e315e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 16:00:40 -0400 Subject: [PATCH 07/18] Add WYSYWIG Linebreaks module Already asking to get this into Drutopia here https://gitlab.com/drutopia/drutopia/issues/219 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f07dd8c..a0c62e2 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ "drush/drush": "^8.0", "drupal/migrate_tools": "^4.0", "drupal/migrate_plus": "^4.0", - "drupal/webform": "^5.0@RC" + "drupal/webform": "^5.0@RC", + "drupal/wysiwyg_linebreaks": "^1.9" }, "repositories": { "drupal": { From e16bc8932e8b74a811bf509855dc3adef43db095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 16:03:28 -0400 Subject: [PATCH 08/18] Update composer lock file with linebreaks, webform --- composer.lock | 155 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index a0b720c..25c09a5 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": "09483f94aba3896055f37dec4472cde0", + "content-hash": "12b3bde72f33133e085321ae961e59b1", "packages": [ { "name": "asm89/stack-cors", @@ -5982,6 +5982,155 @@ "source": "http://cgit.drupalcode.org/token" } }, + { + "name": "drupal/webform", + "version": "5.0.0-rc19", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/webform", + "reference": "8.x-5.0-rc19" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/webform-8.x-5.0-rc19.zip", + "reference": "8.x-5.0-rc19", + "shasum": "43fe62f145c393bb5c8ceae0278434cb91ac4859" + }, + "require": { + "drupal/core": "*" + }, + "require-dev": { + "drupal/address": "~1.4", + "drupal/devel": "*", + "drupal/token": "~1.3", + "drupal/webform_access": "*", + "drupal/webform_node": "*", + "drupal/webform_scheduled_email": "*", + "drupal/webform_ui": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-5.x": "5.x-dev" + }, + "drupal": { + "version": "8.x-5.0-rc19", + "datestamp": "1536257580", + "security-coverage": { + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jacob Rockowitz (jrockowitz)", + "homepage": "https://www.drupal.org/u/jrockowitz", + "role": "Maintainer" + }, + { + "name": "Alexander Trotsenko (bucefal91)", + "homepage": "https://www.drupal.org/u/bucefal91", + "role": "Co-maintainer" + }, + { + "name": "bucefal91", + "homepage": "https://www.drupal.org/user/504128" + }, + { + "name": "fenstrat", + "homepage": "https://www.drupal.org/user/362649" + }, + { + "name": "jrockowitz", + "homepage": "https://www.drupal.org/user/371407" + }, + { + "name": "podarok", + "homepage": "https://www.drupal.org/user/116002" + }, + { + "name": "quicksketch", + "homepage": "https://www.drupal.org/user/35821" + }, + { + "name": "sanchiz", + "homepage": "https://www.drupal.org/user/1671246" + }, + { + "name": "tedbow", + "homepage": "https://www.drupal.org/user/240860" + }, + { + "name": "torotil", + "homepage": "https://www.drupal.org/user/865256" + } + ], + "description": "Enables the creation of webforms and questionnaires.", + "homepage": "https://drupal.org/project/webform", + "support": { + "source": "http://cgit.drupalcode.org/webform", + "issues": "https://www.drupal.org/project/issues/webform?version=8.x", + "docs": "https://www.drupal.org/docs/8/modules/webform", + "forum": "https://drupal.stackexchange.com/questions/tagged/webform" + } + }, + { + "name": "drupal/wysiwyg_linebreaks", + "version": "1.9.0", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/wysiwyg_linebreaks", + "reference": "8.x-1.9" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/wysiwyg_linebreaks-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "0b6491f0e37bb1d8a3cc94a391a3fda8c9e3ddbe" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.9", + "datestamp": "1485147489", + "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": "geerlingguy", + "homepage": "https://www.drupal.org/user/389011" + } + ], + "description": "Plugin to allow legacy content editing and more sane formatting in wysiwyg editors.", + "homepage": "https://www.drupal.org/project/wysiwyg_linebreaks", + "support": { + "source": "http://cgit.drupalcode.org/wysiwyg_linebreaks" + } + }, { "name": "drush/drush", "version": "8.1.17", @@ -10706,7 +10855,9 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "drupal/webform": 5 + }, "prefer-stable": true, "prefer-lowest": false, "platform": [], From 269c90cb9e66f892d842e2b75d5420b13b8650b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 16:07:12 -0400 Subject: [PATCH 09/18] Ignore folder for SQL dumps --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2b7e68c..4bdb833 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,9 @@ web/themes/custom/*/*.js web/themes/custom/*/src vendor/ +## Ignore folder for SQL dumps +/sql + ## What you CAN commit: # config # web/themes/custom/*/templates From 5d0830d4e57a831115026492f5d13074bbb3b8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 18:50:05 -0400 Subject: [PATCH 10/18] Commit configuration updated by Drupal 8.6 --- ...ync.module.migrate_drupal_multilingual.yml | 11 ++++++ ...y_form_display.comment.comment.default.yml | 2 ++ ...y_view_display.comment.comment.default.yml | 2 ++ config/sync/core.extension.yml | 1 + .../sync/field.storage.node.field_image.yml | 2 +- config/sync/image.style.small_square.yml | 1 + config/sync/image.style.square_thumbnail.yml | 1 + .../system.action.comment_delete_action.yml | 2 +- .../sync/system.action.node_delete_action.yml | 2 +- config/sync/views.view.block_content.yml | 36 +++++++++++++++++++ config/sync/views.view.watchdog.yml | 12 +++---- 11 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.migrate_drupal_multilingual.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.migrate_drupal_multilingual.yml b/config/sync/config_snapshot.snapshot.config_sync.module.migrate_drupal_multilingual.yml new file mode 100644 index 0000000..21d04bd --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.migrate_drupal_multilingual.yml @@ -0,0 +1,11 @@ +uuid: da54d461-6634-4b68-a53b-20610b3d7dec +langcode: en +status: true +dependencies: + module: + - migrate_drupal_multilingual +id: config_sync.module.migrate_drupal_multilingual +snapshotSet: config_sync +extensionType: module +extensionName: migrate_drupal_multilingual +items: { } diff --git a/config/sync/core.entity_form_display.comment.comment.default.yml b/config/sync/core.entity_form_display.comment.comment.default.yml index 554b885..b195ac6 100644 --- a/config/sync/core.entity_form_display.comment.comment.default.yml +++ b/config/sync/core.entity_form_display.comment.comment.default.yml @@ -17,6 +17,8 @@ content: author: weight: -2 region: content + settings: { } + third_party_settings: { } comment_body: type: text_textarea weight: 11 diff --git a/config/sync/core.entity_view_display.comment.comment.default.yml b/config/sync/core.entity_view_display.comment.comment.default.yml index 02e30dc..2d4b49d 100644 --- a/config/sync/core.entity_view_display.comment.comment.default.yml +++ b/config/sync/core.entity_view_display.comment.comment.default.yml @@ -24,4 +24,6 @@ content: links: weight: 100 region: content + settings: { } + third_party_settings: { } hidden: { } diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index d0c7e63..a3b8b61 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -75,6 +75,7 @@ module: metatag: 0 migrate: 0 migrate_drupal: 0 + migrate_drupal_multilingual: 0 migrate_plus: 0 migrate_tools: 0 node: 0 diff --git a/config/sync/field.storage.node.field_image.yml b/config/sync/field.storage.node.field_image.yml index 5b87be8..93e51c6 100644 --- a/config/sync/field.storage.node.field_image.yml +++ b/config/sync/field.storage.node.field_image.yml @@ -15,7 +15,7 @@ type: image settings: uri_scheme: public default_image: - uuid: '' + uuid: null alt: '' title: '' width: null diff --git a/config/sync/image.style.small_square.yml b/config/sync/image.style.small_square.yml index d51db43..953b6f7 100644 --- a/config/sync/image.style.small_square.yml +++ b/config/sync/image.style.small_square.yml @@ -14,3 +14,4 @@ effects: data: width: 170 height: 170 + anchor: center-center diff --git a/config/sync/image.style.square_thumbnail.yml b/config/sync/image.style.square_thumbnail.yml index 7adb62c..5a554ff 100644 --- a/config/sync/image.style.square_thumbnail.yml +++ b/config/sync/image.style.square_thumbnail.yml @@ -14,3 +14,4 @@ effects: data: width: 100 height: 100 + anchor: center-center diff --git a/config/sync/system.action.comment_delete_action.yml b/config/sync/system.action.comment_delete_action.yml index ec3f087..0911947 100644 --- a/config/sync/system.action.comment_delete_action.yml +++ b/config/sync/system.action.comment_delete_action.yml @@ -9,5 +9,5 @@ _core: id: comment_delete_action label: 'Delete comment' type: comment -plugin: comment_delete_action +plugin: 'entity:delete_action:comment' configuration: { } diff --git a/config/sync/system.action.node_delete_action.yml b/config/sync/system.action.node_delete_action.yml index 41013b8..884d039 100644 --- a/config/sync/system.action.node_delete_action.yml +++ b/config/sync/system.action.node_delete_action.yml @@ -9,5 +9,5 @@ _core: id: node_delete_action label: 'Delete content' type: node -plugin: node_delete_action +plugin: 'entity:delete_action:node' configuration: { } diff --git a/config/sync/views.view.block_content.yml b/config/sync/views.view.block_content.yml index 52d3e07..f5e4724 100644 --- a/config/sync/views.view.block_content.yml +++ b/config/sync/views.view.block_content.yml @@ -434,6 +434,42 @@ display: entity_type: block_content entity_field: type plugin_id: bundle + reusable: + id: reusable + table: block_content_field_data + field: reusable + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '1' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + identifier: '' + required: false + remember: false + multiple: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: block_content + entity_field: reusable + plugin_id: boolean sorts: { } title: 'Custom block library' header: { } diff --git a/config/sync/views.view.watchdog.yml b/config/sync/views.view.watchdog.yml index 1ab548a..638b6d5 100644 --- a/config/sync/views.view.watchdog.yml +++ b/config/sync/views.view.watchdog.yml @@ -655,18 +655,16 @@ display: footer: { } empty: area: - id: area + id: area_text_custom table: views - field: area + field: area_text_custom relationship: none group_type: group - admin_label: '' + admin_label: 'No log messages available.' empty: true tokenize: false - content: - value: 'No log messages available.' - format: basic_html - plugin_id: text + content: 'No log messages available.' + plugin_id: text_custom relationships: uid: id: uid From b3e60ed406ea9749386e973cac4774ff7719e087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 18:51:48 -0400 Subject: [PATCH 11/18] Commit self-updates to configuration ofter a cache reload --- config/sync/core.entity_view_display.node.page.teaser.yml | 3 +++ config/sync/field.field.user.user.field_bio.yml | 1 + config/sync/field.field.user.user.field_gpg_public_key.yml | 1 + config/sync/field.storage.user.field_bio.yml | 1 + config/sync/field.storage.user.field_gpg_public_key.yml | 1 + 5 files changed, 7 insertions(+) diff --git a/config/sync/core.entity_view_display.node.page.teaser.yml b/config/sync/core.entity_view_display.node.page.teaser.yml index ef6fd39..c7978c6 100644 --- a/config/sync/core.entity_view_display.node.page.teaser.yml +++ b/config/sync/core.entity_view_display.node.page.teaser.yml @@ -67,4 +67,7 @@ content: hidden: body: true field_body_paragraph: true + field_file: true + field_image: true field_meta_tags: true + field_storyline: true diff --git a/config/sync/field.field.user.user.field_bio.yml b/config/sync/field.field.user.user.field_bio.yml index 5e38bc2..7ca2a72 100644 --- a/config/sync/field.field.user.user.field_bio.yml +++ b/config/sync/field.field.user.user.field_bio.yml @@ -1,3 +1,4 @@ +uuid: 9c991ded-e9f0-469c-a68f-c15f7f2ba9cb langcode: en status: true dependencies: diff --git a/config/sync/field.field.user.user.field_gpg_public_key.yml b/config/sync/field.field.user.user.field_gpg_public_key.yml index 6894e74..d456d61 100644 --- a/config/sync/field.field.user.user.field_gpg_public_key.yml +++ b/config/sync/field.field.user.user.field_gpg_public_key.yml @@ -1,3 +1,4 @@ +uuid: 6fab4262-f202-461f-adb6-16e8b786fc27 langcode: en status: true dependencies: diff --git a/config/sync/field.storage.user.field_bio.yml b/config/sync/field.storage.user.field_bio.yml index 72f817a..230c4fe 100644 --- a/config/sync/field.storage.user.field_bio.yml +++ b/config/sync/field.storage.user.field_bio.yml @@ -1,3 +1,4 @@ +uuid: 0087065a-88d7-4bce-a86a-9e9946bb84b7 langcode: en status: true dependencies: diff --git a/config/sync/field.storage.user.field_gpg_public_key.yml b/config/sync/field.storage.user.field_gpg_public_key.yml index 8eb4809..63daaee 100644 --- a/config/sync/field.storage.user.field_gpg_public_key.yml +++ b/config/sync/field.storage.user.field_gpg_public_key.yml @@ -1,3 +1,4 @@ +uuid: 77c162e8-9f8c-43ff-b1f1-63a515f00590 langcode: en status: true dependencies: From 77c125c625fe0c11fca666cb4d520d526cbbbbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 6 Sep 2018 19:13:28 -0400 Subject: [PATCH 12/18] Install and configure WYSIWYG linebreaks --- config/sync/core.extension.yml | 1 + config/sync/editor.editor.basic_html.yml | 8 +++-- config/sync/editor.editor.full_html.yml | 8 +++-- config/sync/filter.format.basic_html.yml | 37 +++++++++++++++++---- config/sync/filter.format.full_html.yml | 42 +++++++++++++++++++++--- 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index a3b8b61..a656e42 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -101,6 +101,7 @@ module: update: 0 user: 0 views_ui: 0 + wysiwyg_linebreaks: 0 ds: 1 menu_link_content: 1 pathauto: 1 diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml index 3177ddb..7987413 100644 --- a/config/sync/editor.editor.basic_html.yml +++ b/config/sync/editor.editor.basic_html.yml @@ -43,13 +43,17 @@ settings: items: - Source plugins: + language: + language_list: un stylescombo: styles: '' + linebreaks: + method: force image_upload: status: true scheme: public directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/editor.editor.full_html.yml b/config/sync/editor.editor.full_html.yml index c7f8970..9dd93d1 100644 --- a/config/sync/editor.editor.full_html.yml +++ b/config/sync/editor.editor.full_html.yml @@ -51,13 +51,17 @@ settings: - ShowBlocks - Source plugins: + language: + language_list: un stylescombo: styles: '' + linebreaks: + method: force image_upload: status: true scheme: public directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/filter.format.basic_html.yml b/config/sync/filter.format.basic_html.yml index 8ca1fda..e98d068 100644 --- a/config/sync/filter.format.basic_html.yml +++ b/config/sync/filter.format.basic_html.yml @@ -14,32 +14,57 @@ filters: id: filter_html provider: filter status: true - weight: -10 + weight: -50 settings: - allowed_html: '