Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
johangant committed Aug 26, 2020
2 parents 245349c + bd6c83f commit 5be36d8
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 47 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,11 @@ jobs:
- image: circleci/php:7.3.14-apache-browsers
steps:
- checkout_code
- run:
name: Checkout edge branch
command: |
cd ~/project
git checkout -b $EDGE_BUILD_BRANCH
- install_php_os_extensions
- run:
name: Add extra OS and PHP extensions/config
Expand Down
14 changes: 8 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,18 @@
"require": {
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"dof-dss/nicsdru_nidirect_theme": "^0.10.1",
"dof-dss/nicsdru_origins_modules": "^0.7.0",
"dof-dss/nicsdru_origins_theme": "0.3.1",
"dof-dss/nicsdru_nidirect_theme": "^0.10.2",
"dof-dss/nicsdru_origins_modules": "^0.8.0",
"dof-dss/nicsdru_origins_theme": "^0.3.1",
"dof-dss/nidirect-d8-test-install-profile": "^0.2.2",
"dof-dss/nidirect-migrations": "0.10.1",
"dof-dss/nidirect-site-modules": "^0.10.1",
"dof-dss/nidirect-migrations": "^0.10.0",
"dof-dss/nidirect-site-modules": "^0.10.2",
"drupal/address": "^1.7",
"drupal/admin_toolbar": "^2.0",
"drupal/adminimal_theme": "^1.5",
"drupal/better_field_descriptions": "^1.5",
"drupal/block_blacklist": "^1.0",
"drupal/block_content_permissions": "^1.10",
"drupal/chosen": "^2.9",
"drupal/clientside_validation": "^1.2",
"drupal/config_filter": "^1.4",
Expand Down Expand Up @@ -142,7 +143,8 @@
"patches": {
"drupal/core": {
"Prevent leftover fields from causing errors like 'Call to a member function getLabel() after enabling layout_builder'": "https://www.drupal.org/files/issues/2020-01-20/2985882-53.patch",
"When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch"
"When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch",
"[PP-1] Provide options to sanitize filenames (transliterate, lowercase, replace whitespace, etc)": "https://www.drupal.org/files/issues/2019-12-06/2492171-294.patch"
},
"drupal/config_split": {
"General typo issues": "https://www.drupal.org/files/issues/2018-10-02/general_typo_issues-3003865-4.patch",
Expand Down
118 changes: 78 additions & 40 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
uuid: f5611ff8-b82e-47ce-b045-6ff4868a51ae
langcode: en
status: true
dependencies:
config:
- core.entity_view_mode.taxonomy_term.full
- field.field.taxonomy_term.site_themes.field_additional_info
- field.field.taxonomy_term.site_themes.field_banner_image
- field.field.taxonomy_term.site_themes.field_meta_tags
- field.field.taxonomy_term.site_themes.field_photo
- field.field.taxonomy_term.site_themes.field_supplementary_parents
- field.field.taxonomy_term.site_themes.field_taxonomy_rank
- field.field.taxonomy_term.site_themes.field_teaser
- field.field.taxonomy_term.site_themes.field_theme_summary
- field.field.taxonomy_term.site_themes.field_toc_enable
- field.field.taxonomy_term.site_themes.field_top_level_theme
- taxonomy.vocabulary.site_themes
module:
- layout_builder
- text
third_party_settings:
layout_builder:
allow_custom: false
enabled: false
id: taxonomy_term.site_themes.full
targetEntityType: taxonomy_term
bundle: site_themes
mode: full
content:
description:
label: hidden
type: text_default
weight: 1
region: content
settings: { }
third_party_settings: { }
field_additional_info:
type: text_default
weight: 2
region: content
label: hidden
settings: { }
third_party_settings: { }
field_theme_summary:
weight: 0
label: hidden
settings: { }
third_party_settings: { }
type: text_default
region: content
hidden:
field_banner_image: true
field_meta_tags: true
field_photo: true
field_supplementary_parents: true
field_taxonomy_rank: true
field_teaser: true
field_toc_enable: true
field_top_level_theme: true
langcode: true
search_api_excerpt: true
1 change: 1 addition & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module:
block: 0
block_blacklist: 0
block_content: 0
block_content_permissions: 0
book: 0
breakpoint: 0
chosen: 0
Expand Down
1 change: 1 addition & 0 deletions config/sync/system.file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ path: { }
temporary_maximum_age: 21600
_core:
default_config_hash: t48gCU9DzYfjb3bAOIqHLzhL0ChBlXh6_5B5Pyo9t8g
filename_transliteration: true
Loading

0 comments on commit 5be36d8

Please sign in to comment.