From 112dca8410a595c5702fd3d655f9c3054f81fd22 Mon Sep 17 00:00:00 2001 From: Rajab Natshah <rajabn@gmail.com> Date: Tue, 23 Oct 2018 20:29:26 +0300 Subject: [PATCH] Issue #3008331: Varbase 8.6.0: Update [CHANGELOG.md, UPDATE.md] files and filtered the code for Drupal 8 Coding Standard --- build.xml | 9 ++++++++- composer.json | 30 +++++++++++++++--------------- drupal-org.make | 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/build.xml b/build.xml index d88ac99f..50c5c42c 100644 --- a/build.xml +++ b/build.xml @@ -90,8 +90,15 @@ <!-- Install with drush site install --> <target name="install-with-drush-site-install" depends="env"> <!-- Use passthru() when executing drush site-install so that we'll know if errors occur. --> - <exec command="${drush} site-install varbase --yes --site-name='Test Varbase6c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_development_tools.varbase_development=true" dir="${docroot}" passthru="true" /> + <exec command="${drush} site-install varbase --yes --site-name='Test Varbase6c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_extra_components.varbase_auth=true varbase_development_tools.varbase_development=true" dir="${docroot}" passthru="true" /> + <exec command="${drush} en varbase_styleguide --yes" dir="${docroot}" /> <exec command="${drush} en vbp_text_and_image --yes" dir="${docroot}" /> + <exec command="${drush} en varbase_media_instagram --yes" dir="${docroot}" /> + <exec command="${drush} en varbase_media_twitter --yes" dir="${docroot}" /> + <exec command="${drush} en social_auth_google --yes" dir="${docroot}" /> + <exec command="${drush} en social_auth_facebook --yes" dir="${docroot}" /> + <exec command="${drush} en social_auth_twitter --yes" dir="${docroot}" /> + <exec command="${drush} en social_auth_linkedin --yes" dir="${docroot}" /> <exec command="${drush} config-set system.performance css.preprocess 0 --yes --format=boolean" dir="${docroot}" /> <exec command="${drush} config-set system.performance js.preprocess 0 --yes --format=boolean" dir="${docroot}" /> <exec command="${drush} config-set system.logging error_level all --yes" dir="${docroot}" /> diff --git a/composer.json b/composer.json index 58e13db4..a678554b 100644 --- a/composer.json +++ b/composer.json @@ -32,21 +32,21 @@ "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.4.0", "drupal/drupal-library-installer-plugin": "^0.3", - "drupal/varbase_core": "6.0", - "drupal/varbase_media": "6.0", - "drupal/varbase_bootstrap_paragraphs": "6.0", - "drupal/varbase_editor": "6.0", - "drupal/varbase_landing": "6.0", - "drupal/varbase_search": "6.0", - "drupal/varbase_seo": "6.0", - "drupal/varbase_heroslider_media": "6.0", - "drupal/varbase_carousels": "6.0", - "drupal/varbase_total_control": "6.0", - "drupal/varbase_auth" : "6.0", - "drupal/varbase_blog" : "6.0", - "drupal/varbase_styleguide": "6.0", - "drupal/vartheme": "6.0", - "drupal/vartheme_admin": "6.0", + "drupal/varbase_core": "^6.0", + "drupal/varbase_media": "^6.0", + "drupal/varbase_bootstrap_paragraphs": "^6.0", + "drupal/varbase_editor": "^6.0", + "drupal/varbase_landing": "^6.0", + "drupal/varbase_search": "^6.0", + "drupal/varbase_seo": "^6.0", + "drupal/varbase_heroslider_media": "^6.0", + "drupal/varbase_carousels": "^6.0", + "drupal/varbase_total_control": "^6.1", + "drupal/varbase_auth" : "^6.0", + "drupal/varbase_blog" : "^6.0", + "drupal/varbase_styleguide": "^6.0", + "drupal/vartheme": "^6.0", + "drupal/vartheme_admin": "^6.0", "drupal/extlink": "1.x-dev#8a773a6c5519ccb167e18cc39d68551b30b0e4b3", "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58", "drupal/entity_clone": "1.x-dev#6d0ce053605e9aaf8412927a9b0ea8da7a9a06e5", diff --git a/drupal-org.make b/drupal-org.make index da906ac3..7b61479d 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -521,7 +521,7 @@ projects[varbase_carousels][type] = module projects[varbase_carousels][version] = 6.0 projects[varbase_total_control][type] = module -projects[varbase_total_control][version] = 6.0 +projects[varbase_total_control][version] = 6.1 projects[varbase_auth][type] = module projects[varbase_auth][version] = 6.0 -- GitLab