diff --git a/composer.json b/composer.json
index c70cefc20849c9b9e5dd8d8ae0686dc134c0ec8f..25ae2c8d1d4ac029992a49a2607cf21db5b23ef6 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"version": "master",
"dist": {
"type": "zip",
- "url": "http://download.ckeditor.com/codesnippet/releases/codesnippet_4.5.11.zip",
+ "url": "https://download.ckeditor.com/codesnippet/releases/codesnippet_4.7.3.zip",
"reference": "master"
}
}
@@ -54,83 +54,64 @@
"type": "package",
"package": {
"name": "harvesthq/chosen",
- "version": "1.6.1",
+ "version": "1.8.2",
"type": "drupal-library",
"dist": {
- "url": "https://github.com/harvesthq/chosen/releases/download/v1.6.1/chosen_v1.6.1.zip",
+ "url": "https://github.com/harvesthq/chosen/releases/download/v1.8.2/chosen_v1.8.2.zip",
"type": "zip"
}
}
}
],
"require": {
- "bower-asset/animate-sass": "~0.6.0",
+ "bower-asset/animate-sass": "~0.6.6",
"bower-asset/bootstrap-sass": "~3.3.7",
"bower-asset/flat-ui-sass": "~2.1.3",
"bower-asset/fontawesome": "~4.7.0",
"ckeditorplugin/codesnippet": "master",
- "composer/installers": "^1.2",
- "cweagans/composer-patches": "~1.0",
- "drupal-composer/drupal-scaffold": "^2.2",
- "drupal/address": "1.0-rc3",
- "drupal/admin_toolbar": "1.19",
- "drupal/avatars": "1.0-beta5",
+ "composer/installers": "^1.4",
+ "cweagans/composer-patches": "~1.6",
+ "drupal-composer/drupal-scaffold": "^2.3",
+ "drupal/address": "^1.2",
+ "drupal/admin_toolbar": "^1.20",
"drupal/block_class": "1.x-dev",
- "drupal/bootstrap": "3.5",
- "drupal/bootstrap_clean_blog": "1.0-rc2",
- "drupal/browser_refresh": "1.3",
- "drupal/chosen": "^2.2",
+ "drupal/bootstrap": "^3.6",
+ "drupal/browser_refresh": "^1.3",
+ "drupal/chosen": "^2.4",
"drupal/codesnippet": "^1.6",
"drupal/coffee": "1.0-beta2",
- "drupal/colorbox": "^1.1",
- "drupal/config_installer": "^1.4",
- "drupal/config_split": "^1.0@beta",
- "drupal/console": "~1.0",
- "drupal/contact_storage": "1.x-dev",
- "drupal/context": "1.x-dev",
- "drupal/context_active_trail": "1.x-dev",
- "drupal/core": "8.4.0",
- "drupal/ctools": "3.0",
- "drupal/diff": "1.0-beta2",
- "drupal/draggableviews": "1.0",
- "drupal/drd_agent": "~3.0",
- "drupal/ds": "2.6",
- "drupal/elastic_email": "2.0",
- "drupal/entity": "1.0-alpha3",
- "drupal/extlink": "1.0",
- "drupal/faq": "1.x-dev",
- "drupal/field_group": "1.x-dev",
- "drupal/honeypot": "1.26",
+ "drupal/colorbox": "^1.4",
+ "drupal/config_installer": "^1.5",
+ "drupal/config_split": "^1.2",
+ "drupal/console": "^1.0",
+ "drupal/core": "^8.4.0",
+ "drupal/drd_agent": "^3.4",
+ "drupal/ds": "^3.1",
+ "drupal/elastic_email": "^2.1",
+ "drupal/entity": "^1.0-beta1",
+ "drupal/extlink": "^1.0",
+ "drupal/field_group": "^1.0-rc6",
+ "drupal/honeypot": "^1.27",
"drupal/linkit": "^5.0",
- "drupal/maillog": "1.x-dev",
- "drupal/metatag": "1.1",
+ "drupal/metatag": "^1.3",
"drupal/navbar_filter": "^1.1",
- "drupal/node_view_permissions": "1.1",
- "drupal/onomasticon": "1.0",
- "drupal/pathauto": "1.0",
- "drupal/piwik": "1.1",
- "drupal/piwik_noscript": "^1.0",
- "drupal/queue_ui": "2.x-dev",
+ "drupal/node_view_permissions": "^1.1",
+ "drupal/pathauto": "^1.0",
+ "drupal/piwik": "^1.1",
+ "drupal/piwik_noscript": "^1.1",
"drupal/recaptcha": "^2.2",
"drupal/redis": "1.0-rc2",
- "drupal/rules": "3.0-alpha2",
+ "drupal/rules": "^3.0-alpha3",
"drupal/security_review": "1.x-dev",
- "drupal/simplenews": "1.x-dev",
- "drupal/slack": "1.x-dev",
+ "drupal/simple_sitemap": "^2.10",
"drupal/smart_login": "1.x-dev",
- "drupal/smtp": "1.0-beta2",
- "drupal/social_profile_field": "^0.2.0",
- "drupal/stage_file_proxy": "1.x-dev",
- "drupal/subpathauto": "1.0-beta1",
- "drupal/tagclouds": "1.x-dev",
- "drupal/token": "1.0",
- "drupal/twitter": "1.x-dev",
- "drupal/unlimited_number": "1.0.0-beta1",
- "drupal/video": "1.2",
- "drupal/videojs": "1.0",
- "drupal/xmlsitemap": "1.0.0-alpha2",
- "drush/drush": "~8.0",
- "harvesthq/chosen": "^1.6",
+ "drupal/smtp": "^1.0-beta3",
+ "drupal/stage_file_proxy": "^1.0-alpha3",
+ "drupal/subpathauto": "^1.0-beta1",
+ "drupal/token": "^1.0",
+ "drupal/unlimited_number": "^1.0-beta2",
+ "drush/drush": "~9.0",
+ "harvesthq/chosen": "^1.8",
"lakedrops/d8-project-scaffold": "~0.4",
"lakedrops/dorgflow": "~0.1",
"lakedrops/theme-d8-sass": "~0.6"
@@ -138,11 +119,11 @@
"require-dev": {
"behat/mink": "~1.7",
"behat/mink-goutte-driver": "~1.2",
- "jcalderonzumba/gastonjs": "~1.0.2",
- "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
- "mikey179/vfsStream": "~1.2",
- "phpunit/phpunit": "~4.8",
- "symfony/css-selector": "~2.8"
+ "jcalderonzumba/gastonjs": "~1.2",
+ "jcalderonzumba/mink-phantomjs-driver": "~0.3",
+ "mikey179/vfsStream": "~1.6",
+ "phpunit/phpunit": "~6.4",
+ "symfony/css-selector": "~3.3"
},
"conflict": {
"drupal/drupal": "*"
@@ -163,8 +144,7 @@
"*": "dist"
},
"sort-packages": true,
- "discard-changes": true,
- "secure-http": false
+ "discard-changes": true
},
"extra": {
"drupal-scaffold": {
@@ -270,9 +250,6 @@
}
},
"patches": {
- "drupal/faq": {
- "Missing argument 4": "https://www.drupal.org/files/issues/missing_argument_4_in_2743715-6.patch"
- },
"drupal/smart_login": {
"Error 403 redirect": "https://www.drupal.org/files/issues/this_is_silently-2831386-2.patch"
},
diff --git a/config/default/sync/core.entity_form_display.node.article.default.yml b/config/default/sync/core.entity_form_display.node.article.default.yml
index 93c8f982cbbc65d268f67579c8b1aaeb04b5706e..2c2b7093bddca29b59ad2b7cdaf525f3bd52d5f1 100644
--- a/config/default/sync/core.entity_form_display.node.article.default.yml
+++ b/config/default/sync/core.entity_form_display.node.article.default.yml
@@ -69,6 +69,13 @@ content:
weight: 15
region: content
third_party_settings: { }
+ status:
+ type: boolean_checkbox
+ settings:
+ display_label: true
+ weight: 120
+ region: content
+ third_party_settings: { }
sticky:
type: boolean_checkbox
settings:
diff --git a/config/default/sync/core.entity_form_display.node.page.default.yml b/config/default/sync/core.entity_form_display.node.page.default.yml
index 3c082d33adbd7d61d54d4001f4c308069e2d8402..f4db46a5ad52a6fb443ff532af7d0301f823f6f4 100644
--- a/config/default/sync/core.entity_form_display.node.page.default.yml
+++ b/config/default/sync/core.entity_form_display.node.page.default.yml
@@ -43,6 +43,13 @@ content:
weight: 15
region: content
third_party_settings: { }
+ status:
+ type: boolean_checkbox
+ settings:
+ display_label: true
+ weight: 120
+ region: content
+ third_party_settings: { }
sticky:
type: boolean_checkbox
settings:
diff --git a/config/default/sync/core.entity_form_display.user.user.default.yml b/config/default/sync/core.entity_form_display.user.user.default.yml
index 6d01d0a8d45f7789529a742c5e528afbbedfbfa2..315bcc5e432aea122dcaebd7c5cf042f8f36a98b 100644
--- a/config/default/sync/core.entity_form_display.user.user.default.yml
+++ b/config/default/sync/core.entity_form_display.user.user.default.yml
@@ -24,6 +24,12 @@ content:
language:
weight: 0
region: content
+ path:
+ type: path
+ weight: 30
+ region: content
+ settings: { }
+ third_party_settings: { }
timezone:
weight: 6
region: content
diff --git a/config/default/sync/core.extension.yml b/config/default/sync/core.extension.yml
index 962eb51df7af57ee185b14809df60034479c4e33..54aaf67c66d882d77032cd9a0731f3b0e4c8e3ad 100644
--- a/config/default/sync/core.extension.yml
+++ b/config/default/sync/core.extension.yml
@@ -43,6 +43,7 @@ module:
recaptcha: 0
redis: 0
search: 0
+ security_review: 0
shortcut: 0
subpathauto: 0
syslog: 0
@@ -53,7 +54,6 @@ module:
toolbar: 0
update: 0
user: 0
- xmlsitemap: 0
menu_link_content: 1
pathauto: 1
views: 10
diff --git a/config/default/sync/security_review.check.security_review-admin_permissions.yml b/config/default/sync/security_review.check.security_review-admin_permissions.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b7fd5f0be8a385a1df4014c94e1732661cf70e50
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-admin_permissions.yml
@@ -0,0 +1 @@
+id: security_review-admin_permissions
diff --git a/config/default/sync/security_review.check.security_review-error_reporting.yml b/config/default/sync/security_review.check.security_review-error_reporting.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cd59a60ed8ef4e41d501e0353eafb261e35bf53e
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-error_reporting.yml
@@ -0,0 +1 @@
+id: security_review-error_reporting
diff --git a/config/default/sync/security_review.check.security_review-executable_php.yml b/config/default/sync/security_review.check.security_review-executable_php.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8fb06fbc9a6d25728460fb357d05d7d47b74ffbf
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-executable_php.yml
@@ -0,0 +1 @@
+id: security_review-executable_php
diff --git a/config/default/sync/security_review.check.security_review-failed_logins.yml b/config/default/sync/security_review.check.security_review-failed_logins.yml
new file mode 100644
index 0000000000000000000000000000000000000000..09d30ccef14df0ff35fa69732ac497d85a21e256
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-failed_logins.yml
@@ -0,0 +1 @@
+id: security_review-failed_logins
diff --git a/config/default/sync/security_review.check.security_review-field.yml b/config/default/sync/security_review.check.security_review-field.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fc9d14af1b3f9912fc689003a17dfaa5f32df05a
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-field.yml
@@ -0,0 +1 @@
+id: security_review-field
diff --git a/config/default/sync/security_review.check.security_review-file_perms.yml b/config/default/sync/security_review.check.security_review-file_perms.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6ab39814fa79c09ac0fe75f66568808301fc71a1
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-file_perms.yml
@@ -0,0 +1 @@
+id: security_review-file_perms
diff --git a/config/default/sync/security_review.check.security_review-input_formats.yml b/config/default/sync/security_review.check.security_review-input_formats.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0f17f697f4321e2428c0103b39442bf447a4b9ba
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-input_formats.yml
@@ -0,0 +1 @@
+id: security_review-input_formats
diff --git a/config/default/sync/security_review.check.security_review-private_files.yml b/config/default/sync/security_review.check.security_review-private_files.yml
new file mode 100644
index 0000000000000000000000000000000000000000..29a6995d110c6707a8af7ba8934b688085986a8b
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-private_files.yml
@@ -0,0 +1 @@
+id: security_review-private_files
diff --git a/config/default/sync/security_review.check.security_review-query_errors.yml b/config/default/sync/security_review.check.security_review-query_errors.yml
new file mode 100644
index 0000000000000000000000000000000000000000..00cacb6540842930ba17bfc41ba299322db334d5
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-query_errors.yml
@@ -0,0 +1 @@
+id: security_review-query_errors
diff --git a/config/default/sync/security_review.check.security_review-temporary_files.yml b/config/default/sync/security_review.check.security_review-temporary_files.yml
new file mode 100644
index 0000000000000000000000000000000000000000..691d66c986e1e75defb9c96f555a0407645f12d1
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-temporary_files.yml
@@ -0,0 +1 @@
+id: security_review-temporary_files
diff --git a/config/default/sync/security_review.check.security_review-trusted_hosts.yml b/config/default/sync/security_review.check.security_review-trusted_hosts.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f529411eae64ef16f5b2c1ae8d928ea3b424430d
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-trusted_hosts.yml
@@ -0,0 +1 @@
+id: security_review-trusted_hosts
diff --git a/config/default/sync/security_review.check.security_review-upload_extensions.yml b/config/default/sync/security_review.check.security_review-upload_extensions.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3d0ea55fce751023738d4880405d71cebde6c1f3
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-upload_extensions.yml
@@ -0,0 +1 @@
+id: security_review-upload_extensions
diff --git a/config/default/sync/security_review.check.security_review-views_access.yml b/config/default/sync/security_review.check.security_review-views_access.yml
new file mode 100644
index 0000000000000000000000000000000000000000..19fdb810ccc1a0c8d6bee2d8d435ce133230ca6f
--- /dev/null
+++ b/config/default/sync/security_review.check.security_review-views_access.yml
@@ -0,0 +1 @@
+id: security_review-views_access
diff --git a/config/default/sync/security_review.settings.yml b/config/default/sync/security_review.settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3166f7c3f0a5272bd1128473d4f21ae23968a579
--- /dev/null
+++ b/config/default/sync/security_review.settings.yml
@@ -0,0 +1,6 @@
+configured: false
+untrusted_roles: { }
+log: true
+last_run: 0
+_core:
+ default_config_hash: TAofkLvbe-YHYKmoCxPjS-BJO_iv1RZKI0vbOhwb2DU
diff --git a/config/default/sync/syslog.settings.yml b/config/default/sync/syslog.settings.yml
index e4b50e21ca1dcfa5c303150354c28100b54fa49c..b04166f4e86b440007b1c3f4ef36c40388d6248c 100644
--- a/config/default/sync/syslog.settings.yml
+++ b/config/default/sync/syslog.settings.yml
@@ -1,5 +1,5 @@
identity: drupal
-facility: '128'
+facility: 128
format: '!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message'
_core:
default_config_hash: WTmxqj231v_x1-nwNRyjyI-HzCW8ZAXSadw4W1HtKi4
diff --git a/config/default/sync/views.view.files.yml b/config/default/sync/views.view.files.yml
index 601baef475459ad525580f59ba662f50162fdd3f..8269bbc431f35c4c2f3e789f48ebd3ad4b2ea903 100644
--- a/config/default/sync/views.view.files.yml
+++ b/config/default/sync/views.view.files.yml
@@ -568,7 +568,7 @@ display:
decimal: .
separator: ','
format_plural: true
- format_plural_string: "1 place\x03@count places"
+ format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
prefix: ''
suffix: ''
plugin_id: numeric
@@ -1010,7 +1010,7 @@ display:
decimal: .
separator: ','
format_plural: false
- format_plural_string: "1\x03@count"
+ format_plural_string: !!binary MQNAY291bnQ=
prefix: ''
suffix: ''
plugin_id: numeric
diff --git a/config/default/sync/xmlsitemap.settings.file.file.yml b/config/default/sync/xmlsitemap.settings.file.file.yml
deleted file mode 100644
index 75a164b4b4727403be26bbbfa9d93c9f8b9afca2..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.settings.file.file.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-status: true
-priority: 0.5
-changefreq: 60
diff --git a/config/default/sync/xmlsitemap.settings.node.article.yml b/config/default/sync/xmlsitemap.settings.node.article.yml
deleted file mode 100644
index 75a164b4b4727403be26bbbfa9d93c9f8b9afca2..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.settings.node.article.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-status: true
-priority: 0.5
-changefreq: 60
diff --git a/config/default/sync/xmlsitemap.settings.node.page.yml b/config/default/sync/xmlsitemap.settings.node.page.yml
deleted file mode 100644
index 75a164b4b4727403be26bbbfa9d93c9f8b9afca2..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.settings.node.page.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-status: true
-priority: 0.5
-changefreq: 60
diff --git a/config/default/sync/xmlsitemap.settings.taxonomy_term.tags.yml b/config/default/sync/xmlsitemap.settings.taxonomy_term.tags.yml
deleted file mode 100644
index 75a164b4b4727403be26bbbfa9d93c9f8b9afca2..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.settings.taxonomy_term.tags.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-status: true
-priority: 0.5
-changefreq: 60
diff --git a/config/default/sync/xmlsitemap.settings.yml b/config/default/sync/xmlsitemap.settings.yml
deleted file mode 100644
index 9b04db1d97979411f277b070fc46134824673187..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-minimum_lifetime: 0
-xsl: 1
-prefetch_aliases: 1
-chunk_size: auto
-batch_limit: 100
-path: xmlsitemap
-frontpage_priority: !!float 1
-frontpage_changefreq: 86400
-lastmod_format: 'Y-m-d\TH:i\Z'
-gz: false
-clean_url: 0
-cron_threshold_error: 1209600
-cron_threshold_warning: 172800
-disable_cron_regeneration: false
-i18n_selection_mode: simple
-_core:
- default_config_hash: 3my4yxTczVKbcKZ8ss1fyyilU1wC19kLZd_IPRbxuyU
diff --git a/config/default/sync/xmlsitemap.xmlsitemap.NXhscRe0440PFpI5dSznEVgmauL25KojD7u4e9aZwOM.yml b/config/default/sync/xmlsitemap.xmlsitemap.NXhscRe0440PFpI5dSznEVgmauL25KojD7u4e9aZwOM.yml
deleted file mode 100644
index 7921c3f15184ec9e22d504901da173b44fe745ea..0000000000000000000000000000000000000000
--- a/config/default/sync/xmlsitemap.xmlsitemap.NXhscRe0440PFpI5dSznEVgmauL25KojD7u4e9aZwOM.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: b86a76c6-c686-4b8f-99c7-4cd1ae2944b2
-langcode: en
-status: true
-dependencies: { }
-id: NXhscRe0440PFpI5dSznEVgmauL25KojD7u4e9aZwOM
-label: 'Full Sitemap'
-chunks: null
-links: null
-max_filesize: null
-context: { }
-updated: null