From 45d5875bb4e74ef71cdbe74545bae9cf1a82fb3d Mon Sep 17 00:00:00 2001 From: Rajab Natshah <rajabn@gmail.com> Date: Tue, 3 Jul 2018 22:23:22 +0300 Subject: [PATCH] Issue #2983221: Back to DEV. --- CHANGELOG.md | 5 ++++- README.md | 2 +- composer.json | 34 +++++++++++++++++----------------- drupal-org.make | 34 +++++++++++++++++----------------- varbase.info.yml | 2 +- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fb5dd0e..a2842912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,13 @@ ### Highlighted important changes since Varbase 8.5.0-alpha1: * Issue [#2983378](http://drupal.org/node/2983378): Added [data entity embed display settings] TO LINK entity image - with target link when we use. + with a target link when we embed the image in the CKEditor. * Issue [#2983236](http://drupal.org/node/2983236): Reverted [Real-time SEO] module back to old JS version (1.x) instead of version (2.x). +* Issue [#2980408](http://drupal.org/node/2980408): + Fixed [Media entity] issue when we update media image, it still + retrieves the old image instead of the updated one. ### Highlighted important changes since Varbase 8.4.x: * Issue [#2959483](http://drupal.org/node/2959483): diff --git a/README.md b/README.md index 2b5cd992..c51b3be1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[](https://travis-ci.org/Vardot/varbase/builds/399700132) Varbase 8.5.0-alpha2 +[](https://travis-ci.org/Vardot/varbase/builds/399720387) Varbase 8.5.0-alpha2 [](https://www.drupal.org/project/varbase) diff --git a/composer.json b/composer.json index e93fa070..51f45bc8 100644 --- a/composer.json +++ b/composer.json @@ -162,23 +162,23 @@ "drupal/anchor_link": "1.6", "drupal/entity_browser_enhanced": "1.0-rc3", "drupal/vmi": "2.0-alpha1", - "drupal/varbase_core": "5.0-alpha2", - "drupal/varbase_media": "5.0-alpha4", - "drupal/varbase_bootstrap_paragraphs": "5.0-alpha2", - "drupal/varbase_editor": "5.0-alpha2", - "drupal/varbase_landing": "5.0-alpha2", - "drupal/varbase_search": "5.0-alpha1", - "drupal/varbase_seo": "5.0-alpha2", - "drupal/varbase_heroslider_media": "5.0-alpha2", - "drupal/varbase_carousels": "5.0-alpha1", - "drupal/varbase_total_control": "5.0-alpha1", - "drupal/varbase_auth" : "5.0-alpha1", - "drupal/varbase_blog" : "5.0-alpha2", - "drupal/varbase_styleguide": "5.0-beta3", - "drupal/vartheme": "5.0-alpha1", - "drupal/vartheme_material": "5.0-alpha1", - "drupal/vartheme_admin": "5.0-alpha1", - "drupal/vartheme_material_admin": "5.0-alpha1", + "drupal/varbase_core": "5.x-dev", + "drupal/varbase_media": "5.x-dev", + "drupal/varbase_bootstrap_paragraphs": "5.x-dev", + "drupal/varbase_editor": "5.x-dev", + "drupal/varbase_landing": "5.x-dev", + "drupal/varbase_search": "5.x-dev", + "drupal/varbase_seo": "5.x-dev", + "drupal/varbase_heroslider_media": "5.x-dev", + "drupal/varbase_carousels": "5.x-dev", + "drupal/varbase_total_control": "5.x-dev", + "drupal/varbase_auth" : "5.x-dev", + "drupal/varbase_blog" : "5.x-dev", + "drupal/varbase_styleguide": "5.x-dev", + "drupal/vartheme": "5.x-dev", + "drupal/vartheme_material": "5.x-dev", + "drupal/vartheme_admin": "5.x-dev", + "drupal/vartheme_material_admin": "5.x-dev", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "npm-asset/dropzone": "4.3.0", "npm-asset/blazy": "1.8.2", diff --git a/drupal-org.make b/drupal-org.make index e0ee2b3e..3cd8d3de 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -518,59 +518,59 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2 ;;;;;;;;;;;;;;;;;;;;; projects[varbase_core][type] = module -projects[varbase_core][version] = 5.0-alpha2 +projects[varbase_core][version] = 5.x-dev projects[varbase_media][type] = module -projects[varbase_media][version] = 5.0-alpha4 +projects[varbase_media][version] = 5.x-dev projects[varbase_bootstrap_paragraphs][type] = module -projects[varbase_bootstrap_paragraphs][version] = 5.0-alpha2 +projects[varbase_bootstrap_paragraphs][version] = 5.x-dev projects[varbase_editor][type] = module -projects[varbase_editor][version] = 5.0-alpha2 +projects[varbase_editor][version] = 5.x-dev projects[varbase_landing][type] = module -projects[varbase_landing][version] = 5.0-alpha2 +projects[varbase_landing][version] = 5.x-dev projects[varbase_search][type] = module -projects[varbase_search][version] = 5.0-alpha1 +projects[varbase_search][version] = 5.x-dev projects[varbase_seo][type] = module -projects[varbase_seo][version] = 5.0-alpha2 +projects[varbase_seo][version] = 5.x-dev projects[varbase_heroslider_media][type] = module -projects[varbase_heroslider_media][version] = 5.0-alpha2 +projects[varbase_heroslider_media][version] = 5.x-dev projects[varbase_carousels][type] = module -projects[varbase_carousels][version] = 5.0-alpha1 +projects[varbase_carousels][version] = 5.x-dev projects[varbase_total_control][type] = module -projects[varbase_total_control][version] = 5.0-alpha1 +projects[varbase_total_control][version] = 5.x-dev projects[varbase_auth][type] = module -projects[varbase_auth][version] = 5.0-alpha1 +projects[varbase_auth][version] = 5.x-dev projects[varbase_blog][type] = module -projects[varbase_blog][version] = 5.0-alpha2 +projects[varbase_blog][version] = 5.x-dev projects[varbase_styleguide][type] = module -projects[varbase_styleguide][version] = 5.0-beta3 +projects[varbase_styleguide][version] = 5.x-dev ;;;;;;;;;;;;;;;;;;;;; ;; Varbase public contributed themes. ;;;;;;;;;;;;;;;;;;;;; projects[vartheme][type] = theme -projects[vartheme][version] = 5.0-alpha1 +projects[vartheme][version] = 5.x-dev projects[vartheme_material][type] = theme -projects[vartheme_material][version] = 5.0-alpha1 +projects[vartheme_material][version] = 5.x-dev projects[vartheme_admin][type] = theme -projects[vartheme_admin][version] = 5.0-alpha1 +projects[vartheme_admin][version] = 5.x-dev projects[vartheme_material_admin][type] = theme -projects[vartheme_material_admin][version] = 5.0-alpha1 +projects[vartheme_material_admin][version] = 5.x-dev ;;;;;;;;;;;;;;;;;;;;; ;; Libraries diff --git a/varbase.info.yml b/varbase.info.yml index 99bd960a..1e3ab94b 100755 --- a/varbase.info.yml +++ b/varbase.info.yml @@ -6,7 +6,7 @@ distribution: name: Varbase install: theme: vartheme_admin -version: 8.x-5.0-alpha2 +version: 8.x-5.x-dev dependencies: # core - automated_cron -- GitLab