From 3d01407af5d8f3d814da61ed5382b04462f31425 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <r.natshah@vardot.com>
Date: Thu, 4 Aug 2016 18:37:26 +0300
Subject: [PATCH] Changed config and values in the composer.json and the make
file.
---
composer.json | 24 ++++--------------------
drupal-org.make | 6 ++----
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/composer.json b/composer.json
index 37add597..817cd61a 100644
--- a/composer.json
+++ b/composer.json
@@ -31,17 +31,6 @@
"url": "https://packagist.drupal-composer.org"
}
],
- "scripts": {
- "post-install-cmd": [
- "PhantomInstaller\\Installer::installPhantomJS",
- "@composer drupal-scaffold",
- "./bin/phing push"
- ],
- "post-update-cmd": [
- "./bin/phing push"
- ],
- "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
- },
"extra": {
"installer-paths": {
"docroot/core": [
@@ -80,20 +69,15 @@
"Issue #2664682 : Implement admin UI for editing Panelizer defaults":
"https://www.drupal.org/files/issues/2664682-45.patch"
},
- "drupal/views_infinite_scroll": {
- "Issue #2701881 : View No results area doesn't appear even view has no results":
- "https://www.drupal.org/files/issues/no-wrapper-empty-rows-2701881-2.patch"
- },
"drupal/entity_browser": {
"Issue #2738843 : The view widget should support radio buttons":
"https://www.drupal.org/files/issues/2738843-7.patch"
},
-
"drush/drush": {
"Adding composer.json support to make-convert command":
"https://github.com/drush-ops/drush/commit/ce82b946d49b09cd33da5ca84feb24a6c35f8f8e.patch"
}
- }
+ }
},
"require": {
"cweagans/composer-patches": "^1.5.0",
@@ -124,8 +108,8 @@
"drupal/embed": "8.1.0-rc3",
"drupal/entity": "8.1.0-alpha3",
"drupal/entity_browser": "8.1.0-alpha6",
- "drupal/entity_embed": "8.1.0",
- "drupal/inline_entity_form": "8.1.0",
+ "drupal/entity_embed": "8.1.0-alpha3",
+ "drupal/inline_entity_form": "8.1.0-alpha6",
"drupal/media_entity": "8.1.0",
"drupal/media_entity_document": "8.1.0",
"drupal/media_entity_image": "8.1.1",
@@ -135,4 +119,4 @@
"drupal/adminimal_theme": "8.1.1",
"drupal/varbase_editor": "8.4.x-dev"
}
-}
\ No newline at end of file
+}
diff --git a/drupal-org.make b/drupal-org.make
index 3d4619d1..ba2f2f9d 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -149,9 +149,7 @@ projects[views_infinite_scroll][type] = module
projects[views_infinite_scroll][subdir] = "contrib"
projects[views_infinite_scroll][download][type] = git
projects[views_infinite_scroll][download][url] = https://git.drupal.org/project/views_infinite_scroll
-projects[views_infinite_scroll][download][tag] = 8.x-1.0
-;; Issue #2701881 : View No results area doesn't appear even view has no results
-projects[views_infinite_scroll][patch][] = https://www.drupal.org/files/issues/no-wrapper-empty-rows-2701881-2.patch
+projects[views_infinite_scroll][download][tag] = 8.x-1.2
projects[embed][type] = module
projects[embed][subdir] = "contrib"
@@ -177,7 +175,7 @@ projects[entity_embed][type] = module
projects[entity_embed][subdir] = "contrib"
projects[entity_embed][download][type] = git
projects[entity_embed][download][url] = https://git.drupal.org/project/entity_embed
-projects[entity_embed][download][tag] = 8.x-1.0-alpha2
+projects[entity_embed][download][tag] = 8.x-1.0-alpha3
projects[inline_entity_form][type] = module
projects[inline_entity_form][subdir] = "contrib"
--
GitLab