From 778d1c1589dce59ff65091421b19a9a190693a2c Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Thu, 10 May 2018 18:47:45 +0300
Subject: [PATCH] Issue #2959483: Added the [Varbase Media Twitter] and
[Varbase Media Instagram] modules, and the use of the experimental [Entity
Browser Generic Embed, Entity Browser Video Embed, Entity Browser Twitter
Embed, ...] modules.
---
composer.json | 24 +++++++++++++++++++++++-
drupal-org-core.make | 6 +++++-
drupal-org.make | 15 +++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index 754dc72a..f0a45b45 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
],
"require": {
"composer/installers": "1.5.0",
+ "oomphinc/composer-installers-extender": "1.1.2",
"cweagans/composer-patches": "1.6.4",
"drupal-composer/drupal-scaffold": "2.4.0",
"drupal/drupal-library-installer-plugin": "0.3",
@@ -57,6 +58,9 @@
"drupal/entity_embed": "1.0-beta2",
"drupal/inline_entity_form": "1.0-beta1",
"drupal/video_embed_field": "2.0",
+ "drupal/media_entity_instagram": "2.0-alpha1",
+ "drupal/media_entity_twitter": "2.0-alpha2",
+ "drupal/media_entity_googledocs": "4.0",
"drupal/crop": "2.0-rc1",
"drupal/focal_point": "1.0-beta6",
"drupal/pathologic": "1.0-alpha1",
@@ -170,6 +174,10 @@
"drupal/vartheme_material": "5.x-dev",
"drupal/vartheme_admin": "5.x-dev",
"drupal/vartheme_material_admin": "5.x-dev",
+ "vardot/entity_browser_generic_embed": "dev-8.x-1.x",
+ "vardot/entity_browser_generic_embed_plugins": "dev-8.x-1.x",
+ "vardot/varbase_vmi_demo": "dev-8.x-5.x",
+ "vardot/varbase_story_demo": "dev-8.x-5.x",
"mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
"vardot/dropzone": "4.3.0.1",
"vardot/blazy": "1.8.2.1",
@@ -250,7 +258,11 @@
"Issue #2599228: Programmatically created translatable content type returns SQL error on content creation":
"https://www.drupal.org/files/issues/2599228-31-tests-only.patch",
"Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal":
- "https://www.drupal.org/files/issues/patch_empty_fix.patch"
+ "https://www.drupal.org/files/issues/patch_empty_fix.patch",
+ "Issue #2877383: Add action support to Media module.":
+ "https://www.drupal.org/files/issues/2877383-56.patch",
+ "Issue #2670730: Provide a delete action for each content entity type.":
+ "https://www.drupal.org/files/issues/2670730-81-89-8.5.0-rc1.patch"
},
"drupal/page_manager": {
"Issue #2665328: Variants take entity label not the variant title":
@@ -371,6 +383,16 @@
"drupal/rabbit_hole": {
"Issue #2918563: rh_media submodule compatible with core media?":
"https://www.drupal.org/files/issues/rh_media-upgrade-drupal8.4.2-2918563-6.patch"
+ },
+ "drupal/entity_embed": {
+ "Issue #2832504: Send the CKEditor instance ID to the embed.preview route.":
+ "https://www.drupal.org/files/issues/2832504-2.patch"
+ },
+ "drupal/entity_browser": {
+ "Issue #2865928: The View widget should filter based on field settings.":
+ "https://www.drupal.org/files/issues/entity-browser-view-context-2865928-14.patch",
+ "Issue #2877751: Inform users how many items they can add to a field that uses an entity browser.":
+ "https://www.drupal.org/files/issues/2877751-27-8.x-2.x.patch"
}
}
}
diff --git a/drupal-org-core.make b/drupal-org-core.make
index b0d95c06..28905686 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -13,4 +13,8 @@ projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_s
;; Issue #2599228: Programmatically created translatable content type returns SQL error on content creation
projects[drupal][patch][] = https://www.drupal.org/files/issues/2599228-31-tests-only.patch
;; Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal
-projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch
\ No newline at end of file
+projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch
+;; Issue #2877383: Add action support to Media module.
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2877383-56.patch
+;; Issue #2670730: Provide a delete action for each content entity type.
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2670730-81-89-8.5.0-rc1.patch
\ No newline at end of file
diff --git a/drupal-org.make b/drupal-org.make
index c84abcce..78cd21cb 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -99,12 +99,18 @@ projects[entity_clone][patch][] = https://www.drupal.org/files/issues/entity_clo
projects[entity_browser][type] = module
projects[entity_browser][version] = 2.0-alpha2
+;; Issue #2865928: The View widget should filter based on field settings.
+projects[entity_embed][patch][] = https://www.drupal.org/files/issues/entity-browser-view-context-2865928-14.patch
+;; Issue #2877751: Inform users how many items they can add to a field that uses an entity browser.
+projects[entity_embed][patch][] = https://www.drupal.org/files/issues/2877751-27-8.x-2.x.patch
projects[dropzonejs][type] = module
projects[dropzonejs][version] = 2.0-alpha3
projects[entity_embed][type] = module
projects[entity_embed][version] = 1.0-beta2
+;; Issue #2832504 - Send the CKEditor instance ID to the embed.preview route.
+projects[entity_embed][patch][] = https://www.drupal.org/files/issues/2832504-2.patch
projects[inline_entity_form][type] = module
projects[inline_entity_form][version] = 1.0-beta1
@@ -112,6 +118,15 @@ projects[inline_entity_form][version] = 1.0-beta1
projects[video_embed_field][type] = module
projects[video_embed_field][version] = 2.0
+projects[media_entity_instagram][type] = module
+projects[media_entity_instagram][version] = 2.0-alpha1
+
+projects[media_entity_twitter][type] = module
+projects[media_entity_twitter][version] = 2.0-alpha2
+
+projects[media_entity_googledocs][type] = module
+projects[media_entity_googledocs][version] = 4.0
+
projects[crop][type] = module
projects[crop][version] = 2.0-rc1
--
GitLab