Skip to content

Commit

Permalink
Merge branch 'master' into feature/SRL-413-google-analytics-status-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepingmonk authored Apr 28, 2021
2 parents 59e7c48 + cd72b65 commit 950eb4c
Show file tree
Hide file tree
Showing 58 changed files with 3,412 additions and 53 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ node_modules
.favorites.json
*.code-workspace
.DS_Store
.lando.local.yml

# Ignore .env files as they are personal
/.env
Expand Down
3 changes: 3 additions & 0 deletions composer-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ packages:
drupal/core-recommended: 8.9.10
drupal/core-vendor-hardening: 8.9.10
drupal/crop: 2.1.0
drupal/csv_serialization: 2.0.0
drupal/ctools: 3.4.0
drupal/datalayer: 1.0.0-beta2
drupal/default_content: 1.0.0-alpha9
Expand All @@ -71,6 +72,7 @@ packages:
drupal/entity_reference_revisions: 1.8.0
drupal/environment_indicator: 3.7.0
drupal/extlink: 1.3.0
drupal/field_defaults: 1.3.0
drupal/field_group: 3.1.0
drupal/fixed_block_content: 1.1.0
drupal/flag: 4.0.0-beta2
Expand Down Expand Up @@ -124,6 +126,7 @@ packages:
drupal/views_ajax_history: 1.5.0
drupal/views_bulk_edit: 2.4.0
drupal/views_bulk_operations: 3.9.0
drupal/views_data_export: 1.0.0
drupal/webform: 5.19.0
drupal/workbench: 1.3.0
drupal/xmlsitemap: 1.0.0-rc1
Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"drupal/entity_embed": "^1.0@RC",
"drupal/environment_indicator": "^3.6",
"drupal/extlink": "^1.1",
"drupal/field_defaults": "^1.3",
"drupal/field_group": "^3.1",
"drupal/fixed_block_content": "^1.0",
"drupal/flag": "^4.0@beta",
Expand Down Expand Up @@ -172,6 +173,7 @@
"drupal/views_ajax_history": "^1.5",
"drupal/views_bulk_edit": "^2.4",
"drupal/views_bulk_operations": "^3.9",
"drupal/views_data_export": "^1.0",
"drupal/webform": "^5.4",
"drupal/workbench": "^1.3",
"drupal/xmlsitemap": "^1.0@alpha",
Expand Down Expand Up @@ -268,6 +270,9 @@
},
"drupal/svg_image_field": {
"Fix previews": "https://www.drupal.org/files/issues/2019-05-06/svg_image_field-zero-width-preview-3053018.patch"
},
"drupal/linkit": {
"Linkit: invalid condition operator": "patches/2769191-invalid-condition-operator-config-entities-8.4.patch"
}
},
"installer-types": [
Expand Down
176 changes: 175 additions & 1 deletion composer.lock

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

3 changes: 2 additions & 1 deletion config/config-default/config_split.config_split.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ id: local
label: Local
description: 'Local development environments.'
folder: ../config/config-local
module: { }
module:
devel: 0
theme: { }
blacklist: { }
graylist:
Expand Down
Loading

1 comment on commit 950eb4c

@sleepingmonk
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Visit Site

Created multidev environment pr-397 for jcc-srl.

Please sign in to comment.