From 4959602a570012c141615c62da0833cef7487ef3 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 20 Jan 2017 18:07:07 +0100
Subject: [PATCH] Enable new features of LakeDrops plugins
---
.gitignore | 1 +
composer.json | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index f6a4ed5..c71a667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ web/themes/contrib/
web/profiles/contrib/
# Ignore Drupal's file directory
+web/sites/*/development.services.yml
web/sites/*/services.yml
web/sites/*/settings.php
web/sites/*/settings.local.php
diff --git a/composer.json b/composer.json
index c237e9c..e359150 100644
--- a/composer.json
+++ b/composer.json
@@ -47,17 +47,16 @@
}
],
"require": {
- "oomphinc/composer-installers-extender": "^1.1.1",
+ "bower-asset/animate-sass": "~0.6.0",
"bower-asset/bootstrap-sass": "~3.3.5",
"bower-asset/flat-ui-sass": "~2.1.3",
"bower-asset/fontawesome": "~4.7.0",
- "bower-asset/animate-sass": "~0.6.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.17",
+ "drupal/admin_toolbar": "1.18",
"drupal/avatars": "1.0-beta5",
"drupal/block_class": "1.x-dev",
"drupal/bootstrap": "3.1.0",
@@ -70,7 +69,7 @@
"drupal/contact_storage": "1.x-dev",
"drupal/context": "1.x-dev",
"drupal/context_active_trail": "1.x-dev",
- "drupal/core": "8.2.3",
+ "drupal/core": "8.2.5",
"drupal/ctools": "3.0-alpha27",
"drupal/diff": "1.0-beta2",
"drupal/draggableviews": "1.0",
@@ -78,13 +77,14 @@
"drupal/ds": "2.6",
"drupal/elastic_email": "2.0",
"drupal/entity": "1.0-alpha3",
- "drupal/extlink": "1.0-alpha3",
+ "drupal/extlink": "1.0",
"drupal/faq": "1.x-dev",
"drupal/field_group": "1.x-dev",
"drupal/honeypot": "1.23",
"drupal/linkit": "^5.0",
"drupal/maillog": "1.x-dev",
- "drupal/metatag": "1.0.0-beta11",
+ "drupal/metatag": "1.0.0-beta12",
+ "drupal/mollom": "^1.2",
"drupal/navbar_filter": "^1.1",
"drupal/node_view_permissions": "1.0",
"drupal/onomasticon": "1.0",
@@ -102,7 +102,7 @@
"drupal/stage_file_proxy": "1.x-dev",
"drupal/subpathauto": "1.0-beta1",
"drupal/tagclouds": "1.x-dev",
- "drupal/token": "1.0-beta2",
+ "drupal/token": "1.0-rc1",
"drupal/twitter": "1.x-dev",
"drupal/unlimited_number": "1.0.0-beta1",
"drupal/video": "1.2",
@@ -110,7 +110,8 @@
"drupal/xmlsitemap": "1.0.0-alpha2",
"drush/drush": "~8.0",
"lakedrops/d8-project-scaffold": "^0.3.1",
- "lakedrops/theme-d8-sass": "^0.3.0"
+ "lakedrops/theme-d8-sass": "^0.3.0",
+ "oomphinc/composer-installers-extender": "^1.1.1"
},
"require-dev": {
"behat/mink": "~1.7",
@@ -195,18 +196,22 @@
"sass": {
"bootstrap-sass": {
"src": "assets/stylesheets",
+ "version": "~3.3.5",
"import": ["bootstrap", "overrides"]
},
"flat-ui-sass": {
"src": "vendor/assets/stylesheets",
+ "version": "~2.1.3",
"import": ["flat-ui/variables", "flat-ui"]
},
"fontawesome": {
"src": "scss",
+ "version": "~4.7.0",
"import": ["font-awesome"]
},
"animate-sass": {
"src": "",
+ "version": "~0.6.0",
"import": ["animate"]
}
}
--
GitLab