Skip to content
This repository has been archived by the owner on Nov 9, 2021. It is now read-only.

Commit

Permalink
Merge pull request #378 from govCMS/release/1.0-beta11
Browse files Browse the repository at this point in the history
Release/1.0 beta11
  • Loading branch information
drupal-spider committed Nov 13, 2019
2 parents 7370777 + be5ef91 commit 75021b7
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 25 deletions.
4 changes: 2 additions & 2 deletions composer-lagoon.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"cweagans/composer-patches": "^1.6.5",
"drupal-composer/drupal-scaffold": "^2.5",
"drupal/console": "^1.0.2",
"drupal/core": "8.7.8",
"drupal/core": "8.7.9",
"drush/drush": "^9.0.0",
"govcms/govcms": "*",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"webflo/drupal-core-strict": "8.7.8"
"webflo/drupal-core-strict": "8.7.9"
},
"conflict": {
"drupal/drupal": "*"
Expand Down
11 changes: 4 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"bower-asset/dropzone": "5.5.0",
"cweagans/composer-patches": "^1.6",
"drupal-composer/drupal-scaffold": "^2.4",
"drupal/admin_toolbar": "1.26",
"drupal/admin_toolbar": "2.0",
"drupal/adminimal_admin_toolbar": "1.9.0",
"drupal/adminimal_theme": "1.4",
"drupal/chosen": "2.6.0",
Expand All @@ -39,7 +39,7 @@
"drupal/consumers": "1.9",
"drupal/contact_storage": "1.0-beta9",
"drupal/context": "4.0-beta2",
"drupal/core": "8.7.8",
"drupal/core": "8.7.9",
"drupal/ctools": "3.2.0",
"drupal/diff": "1.0-rc2",
"drupal/devel": "2.0",
Expand All @@ -56,15 +56,15 @@
"drupal/facets": "1.3",
"drupal/features": "3.8",
"drupal/field_group": "3.0-rc1",
"drupal/focal_point": "1.0-beta6",
"drupal/focal_point": "1.2",
"drupal/google_analytics": "3.0",
"drupal/govcms8_ui": "1.0.0-alpha1",
"drupal/govcms8_uikit_starter": "1.0-alpha2",
"drupal/graphql": "3.0.0-rc2",
"drupal/honeypot": "1.29",
"drupal/inline_entity_form": "1.0-rc1",
"drupal/linked_field": "1.1.0",
"drupal/linkit": "5.0-beta8",
"drupal/linkit": "5.0-beta9",
"drupal/login_security": "1.5",
"drupal/memcache": "2.0",
"drupal/menu_block": "1.5",
Expand Down Expand Up @@ -148,9 +148,6 @@
},
"drupal/google_analytics": {
"Fatal error when there is a view with the path search/node": "https://www.drupal.org/files/issues/2018-06-18/patch_google_analytics.patch"
},
"drupal/linkit": {
"Drupal 8.7 no longer has a dedicated canonical route for media entities, breaks entity matcher deriver - https://www.drupal.org/project/linkit/issues/3040749": "https://www.drupal.org/files/issues/2019-05-03/linkit-media-87-3040749-8.patch"
}
}
},
Expand Down
25 changes: 14 additions & 11 deletions config/install/filter.format.rich_text.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
uuid: a50f2642-69ea-4ab4-8bdc-be6c8ae1c5ca
langcode: en
status: true
dependencies:
module:
- editor
- entity_embed
- linkit
_core:
default_config_hash: qQP0Jozbd9Kvj1_OQh0cHpXV0cvAWCEL7enFNmNXv3E
name: 'Rich text'
format: rich_text
weight: -9
Expand All @@ -13,19 +16,19 @@ filters:
id: filter_autop
provider: filter
status: true
weight: -46
weight: -45
settings: { }
filter_htmlcorrector:
id: filter_htmlcorrector
provider: filter
status: true
weight: -44
status: false
weight: -43
settings: { }
filter_url:
id: filter_url
provider: filter
status: true
weight: -45
weight: -44
settings:
filter_url_length: 72
filter_html:
Expand All @@ -34,14 +37,14 @@ filters:
status: true
weight: -50
settings:
allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id class> <h3 id> <h4 id> <h5 id> <h6 id> <img src alt data-entity-type data-entity-uuid> <u> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <p> <drupal-entity alt title data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button>'
allowed_html: '<a href hreflang data-entity-substitution data-entity-type data-entity-uuid> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id class> <h3 id> <h4 id> <h5 id> <h6 id> <img src alt data-entity-type data-entity-uuid> <u> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <p> <drupal-entity alt title data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button>'
filter_html_help: true
filter_html_nofollow: false
editor_file_reference:
id: editor_file_reference
provider: editor
status: false
weight: -42
weight: -41
settings: { }
entity_embed:
id: entity_embed
Expand All @@ -59,24 +62,24 @@ filters:
id: filter_align
provider: filter
status: true
weight: -48
weight: -47
settings: { }
filter_caption:
id: filter_caption
provider: filter
status: true
weight: -47
weight: -46
settings: { }
filter_html_escape:
id: filter_html_escape
provider: filter
status: false
weight: -43
weight: -42
settings: { }
linkit:
id: linkit
provider: linkit
status: false
weight: -41
status: true
weight: -49
settings:
title: true
34 changes: 34 additions & 0 deletions config/install/linkit.linkit_profile.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
uuid: 79f41ad6-d7b2-48df-afe2-81832af22b75
langcode: en
status: true
dependencies:
module:
- node
_core:
default_config_hash: Tt8DtxZ3Nooo0PoWPpJvszA3R_5d8MmpUW7LM_R-BzY
id: default
label: Default
description: 'A default Linkit profile'
matchers:
556010a3-e317-48b3-b4ed-854c10f4b950:
uuid: 556010a3-e317-48b3-b4ed-854c10f4b950
id: 'entity:node'
weight: 0
settings:
metadata: 'by [node:author] | [node:created:medium]'
bundles: { }
group_by_bundle: false
include_unpublished: false
substitution_type: canonical
limit: 100
fb620089-0ffb-4227-8530-7b09237b217a:
uuid: fb620089-0ffb-4227-8530-7b09237b217a
id: 'entity:media'
weight: 0
settings:
metadata: '[media:field_media_file:entity:basename] | [media:field_media_file:entity:size]'
bundles:
file: file
group_by_bundle: true
substitution_type: media
limit: 100
2 changes: 1 addition & 1 deletion drupal-org-core.make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
core = 8.x
api = 2
projects[drupal][type] = core
projects[drupal][version] = 8.7.8
projects[drupal][version] = 8.7.9
7 changes: 3 additions & 4 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ core = 8.x
api = 2
defaults[projects][subdir] = contrib
projects[admin_toolbar][type] = module
projects[admin_toolbar][version] = 1.26
projects[admin_toolbar][version] = 2.0
projects[adminimal_admin_toolbar][type] = module
projects[adminimal_admin_toolbar][version] = 1.9
projects[adminimal_theme][type] = theme
Expand Down Expand Up @@ -73,7 +73,7 @@ projects[features][version] = 3.8
projects[field_group][type] = module
projects[field_group][version] = 3.0-rc1
projects[focal_point][type] = module
projects[focal_point][version] = 1.0-beta6
projects[focal_point][version] = 1.2
projects[google_analytics][type] = module
projects[google_analytics][version] = 3.0
projects[google_analytics][patch][] = "https://www.drupal.org/files/issues/2018-06-18/patch_google_analytics.patch"
Expand All @@ -90,8 +90,7 @@ projects[inline_entity_form][version] = 1.0-rc1
projects[linked_field][type] = module
projects[linked_field][version] = 1.1
projects[linkit][type] = module
projects[linkit][patch][] = https://www.drupal.org/files/issues/2019-05-03/linkit-media-87-3040749-8.patch
projects[linkit][version] = 5.0-beta8
projects[linkit][version] = 5.0-beta9
projects[login_security][type] = module
projects[login_security][version] = 1.5
projects[mailsystem][type] = module
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

/**
* Implements hook_form_alter().
*
* @inheritDoc
*/
function govcms_content_types_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {

// Author information shouldn't be displayed by default for new content types.
// If desired, it can be enabled however ISM states individual employees
// shouldn't have their names or details present on the website.
if ($form_id === "node_type_add_form") {
$form['display']['display_submitted']['#default_value'] = 0;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
langcode: en
status: true
dependencies:
module:
- node
id: standard_page
label: Standard Page
type: 'canonical_entities:node'
pattern: '[node:title]'
selection_criteria:
3541b888-ba9c-41b5-85a4-a16148c9c5b4:
id: node_type
bundles:
govcms_standard_page: govcms_standard_page
negate: false
context_mapping:
node: node
uuid: 3541b888-ba9c-41b5-85a4-a16148c9c5b4
selection_logic: and
weight: -5
relationships: { }

0 comments on commit 75021b7

Please sign in to comment.