From 7b5fca43b545819aabc69b214d4a6e2bdc3c6529 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 30 Aug 2019 15:59:38 -0600 Subject: [PATCH 1/7] Update the form display of comments --- ...ity_form_display.comment.comment.default.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) 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 b2bc914..03267ae 100644 --- a/config/sync/core.entity_form_display.comment.comment.default.yml +++ b/config/sync/core.entity_form_display.comment.comment.default.yml @@ -15,22 +15,17 @@ bundle: comment mode: default content: author: - weight: -2 + weight: 0 region: content + settings: { } + third_party_settings: { } comment_body: type: text_textarea - weight: 11 + weight: 1 settings: rows: 5 placeholder: '' third_party_settings: { } region: content - subject: - type: string_textfield - weight: 10 - settings: - size: 60 - placeholder: '' - third_party_settings: { } - region: content -hidden: { } +hidden: + subject: true From 5887bca71ca83e19e85f137bd18c9d1bed319f5b Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 30 Aug 2019 16:01:51 -0600 Subject: [PATCH 2/7] Update the settings for comments on Article --- config/sync/field.field.node.article.comment.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sync/field.field.node.article.comment.yml b/config/sync/field.field.node.article.comment.yml index 90ebf67..b4353db 100644 --- a/config/sync/field.field.node.article.comment.yml +++ b/config/sync/field.field.node.article.comment.yml @@ -15,7 +15,7 @@ entity_type: node bundle: article label: Comments description: '' -required: true +required: false translatable: true default_value: - @@ -29,7 +29,7 @@ default_value_callback: '' settings: default_mode: 1 per_page: 50 - anonymous: 0 - form_location: false - preview: 1 + anonymous: 1 + form_location: true + preview: 0 field_type: comment From 9eb03674322de34dd550f32d62014c611b2013a1 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 30 Aug 2019 16:02:13 -0600 Subject: [PATCH 3/7] Update the settings for comments on Blog --- config/sync/field.field.node.blog.comment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sync/field.field.node.blog.comment.yml b/config/sync/field.field.node.blog.comment.yml index 93e05e8..e44a9e0 100644 --- a/config/sync/field.field.node.blog.comment.yml +++ b/config/sync/field.field.node.blog.comment.yml @@ -29,7 +29,7 @@ default_value_callback: '' settings: default_mode: 1 per_page: 50 - anonymous: 0 - form_location: false - preview: 1 + anonymous: 1 + form_location: true + preview: 0 field_type: comment From 18b86426474d8c1f1f394c03411e96668d4eeee3 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Aug 2019 21:24:48 -0400 Subject: [PATCH 4/7] Remove geo_upgrade mod from config --- config/sync/core.extension.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 93d99db..319f089 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -58,7 +58,6 @@ module: fixed_block_content: 0 focal_point: 0 gdpr: 0 - geo_upgrade: 0 hal: 0 help: 0 history: 0 From 8f97e06ea845fa3e783feb3b58d91ab6977bbbb8 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Aug 2019 21:32:06 -0400 Subject: [PATCH 5/7] Revert "Remove geo_upgrade mod from config" You should do it properly...something might break, warned Ben. This reverts commit 18b86426474d8c1f1f394c03411e96668d4eeee3. --- config/sync/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 319f089..93d99db 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -58,6 +58,7 @@ module: fixed_block_content: 0 focal_point: 0 gdpr: 0 + geo_upgrade: 0 hal: 0 help: 0 history: 0 From 81ff1b231677a2392f43eb7828f9724e03a3bc9f Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Aug 2019 21:33:12 -0400 Subject: [PATCH 6/7] Cannot have multiple slashes for composer name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a4aad45..daed21b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "agaric/sites/geo", + "name": "agaric-sites/geo", "description": "Drutopia-based site for the Grassroots Economic Organizing collective.", "type": "project", "license": "GPL-2.0+", From 8aa07e9514393a21bf26411461754753dda85192 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Aug 2019 21:41:09 -0400 Subject: [PATCH 7/7] Remove geo_upgrade, take two OK, now I see...I think --- ...napshot.config_sync.module.geo_upgrade.yml | 27 ------------------- config/sync/core.extension.yml | 1 - 2 files changed, 28 deletions(-) delete mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml b/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml deleted file mode 100644 index f9ac5b8..0000000 --- a/config/sync/config_snapshot.snapshot.config_sync.module.geo_upgrade.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 371cab72-414d-48bb-8bd9-2fd973d6860b -langcode: en -status: true -dependencies: - module: - - geo_upgrade -id: config_sync.module.geo_upgrade -snapshotSet: config_sync -extensionType: module -extensionName: geo_upgrade -items: - - - collection: '' - name: migrate_plus.migration_group.migrate_drupal_7_geo - data: - langcode: en - id: migrate_drupal_7_geo - label: 'Import from Drupal 7' - description: 'Migrate from the D7 version of the site' - source_type: 'Drupal 7' - shared_configuration: - source: - key: drupal7 - dependencies: - enforced: - module: - - geo_upgrade diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 93d99db..319f089 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -58,7 +58,6 @@ module: fixed_block_content: 0 focal_point: 0 gdpr: 0 - geo_upgrade: 0 hal: 0 help: 0 history: 0