Merge remote-tracking branch 'mainline/merchant_beta' into merchant_beta

magento · Oct 30, 2015 · 1fe5da5 · 1fe5da5
2 parents d1989cf + 38de4f1
commit 1fe5da5
Show file tree

Hide file tree

Showing 108 changed files with 927 additions and 926 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+1.0.0-beta6
+=============
+* Fixed bugs:
+ * Fixed an issue with сustomer attribute creation in admin panel
+ * Fixed an issue with translation in html files using $t()
+ * Fixed an issue when save customer with custom attribute of type "file"
+ * Fixed an issue with container "page.bottom.container" in empty layout file
+ * Fixed an issue with rendering of static blocks grid on the store view
+ * Fixed an issue with rendering of multi-select customer attribute in admin panel
+ * Fixed an issue with categories import in a comma-separated format
+ * Fixed an issue with media import/export functionality
+ * Fixed an issue with category link management interface when getting assigned products 
+ * Fixed an issue with URL rewrite bulk assignment to website in multi-store mode
+ * Fixed an issue with website shopping cart rules applying
+ * Fixed an issue with limiter in My Account -> My Orders
+ * Fixed an issue with layout xml files that doesn't have translations
+* Various improvements:
+ * Validation error is shown on the focus out event of the email field during Checkout
+ * Added translations to layout xml files
+ * Various security improvements
+
 1.0.0-beta5
 =============
 * Fixed bugs:

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -3,15 +3,15 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/module-media-storage": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/module-media-storage": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "lib-libxml": "*",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -3,18 +3,18 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/module-catalog-inventory": "1.0.0-beta5",
- "magento/module-eav": "1.0.0-beta5",
- "magento/module-import-export": "1.0.0-beta5",
- "magento/module-catalog-import-export": "1.0.0-beta5",
- "magento/module-customer": "1.0.0-beta5",
- "magento/module-store": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/module-catalog-inventory": "1.0.0-beta6",
+ "magento/module-eav": "1.0.0-beta6",
+ "magento/module-import-export": "1.0.0-beta6",
+ "magento/module-catalog-import-export": "1.0.0-beta6",
+ "magento/module-customer": "1.0.0-beta6",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -3,12 +3,12 @@
  "description": "Authorization module provides access to Magento ACL functionality.",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-backend": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -3,18 +3,18 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-sales": "1.0.0-beta5",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-quote": "1.0.0-beta5",
- "magento/module-checkout": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/module-payment": "1.0.0-beta5",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-sales": "1.0.0-beta6",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-quote": "1.0.0-beta6",
+ "magento/module-checkout": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/module-payment": "1.0.0-beta6",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "proprietary"
  ],

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -3,27 +3,27 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-directory": "1.0.0-beta5",
- "magento/module-developer": "1.0.0-beta5",
- "magento/module-eav": "1.0.0-beta5",
- "magento/module-cron": "1.0.0-beta5",
- "magento/module-theme": "1.0.0-beta5",
- "magento/module-reports": "1.0.0-beta5",
- "magento/module-sales": "1.0.0-beta5",
- "magento/module-quote": "1.0.0-beta5",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/module-user": "1.0.0-beta5",
- "magento/module-backup": "1.0.0-beta5",
- "magento/module-customer": "1.0.0-beta5",
- "magento/module-translation": "1.0.0-beta5",
- "magento/module-require-js": "1.0.0-beta5",
- "magento/module-config": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-directory": "1.0.0-beta6",
+ "magento/module-developer": "1.0.0-beta6",
+ "magento/module-eav": "1.0.0-beta6",
+ "magento/module-cron": "1.0.0-beta6",
+ "magento/module-theme": "1.0.0-beta6",
+ "magento/module-reports": "1.0.0-beta6",
+ "magento/module-sales": "1.0.0-beta6",
+ "magento/module-quote": "1.0.0-beta6",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/module-user": "1.0.0-beta6",
+ "magento/module-backup": "1.0.0-beta6",
+ "magento/module-customer": "1.0.0-beta6",
+ "magento/module-translation": "1.0.0-beta6",
+ "magento/module-require-js": "1.0.0-beta6",
+ "magento/module-config": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,14 +3,14 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/module-cron": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/module-cron": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -3,27 +3,27 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-config": "1.0.0-beta5",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-checkout": "1.0.0-beta5",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/module-sales": "1.0.0-beta5",
- "magento/module-customer": "1.0.0-beta5",
- "magento/module-payment": "1.0.0-beta5",
- "magento/module-paypal": "1.0.0-beta5",
- "magento/module-quote": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/module-directory": "1.0.0-beta5",
- "magento/module-theme": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-config": "1.0.0-beta6",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-checkout": "1.0.0-beta6",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/module-sales": "1.0.0-beta6",
+ "magento/module-customer": "1.0.0-beta6",
+ "magento/module-payment": "1.0.0-beta6",
+ "magento/module-paypal": "1.0.0-beta6",
+ "magento/module-quote": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/module-directory": "1.0.0-beta6",
+ "magento/module-theme": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "braintree/braintree_php": "2.39.0",
  "magento/magento-composer-installer": "*"
  },
  "suggest": {
- "magento/module-checkout-agreements": "1.0.0-beta5"
+ "magento/module-checkout-agreements": "1.0.0-beta6"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "proprietary"
  ],

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -3,28 +3,28 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/module-tax": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/module-sales": "1.0.0-beta5",
- "magento/module-checkout": "1.0.0-beta5",
- "magento/module-catalog-inventory": "1.0.0-beta5",
- "magento/module-customer": "1.0.0-beta5",
- "magento/module-catalog-rule": "1.0.0-beta5",
- "magento/module-eav": "1.0.0-beta5",
- "magento/module-config": "1.0.0-beta5",
- "magento/module-gift-message": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
- "magento/module-quote": "1.0.0-beta5",
- "magento/module-media-storage": "1.0.0-beta5",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/module-tax": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/module-sales": "1.0.0-beta6",
+ "magento/module-checkout": "1.0.0-beta6",
+ "magento/module-catalog-inventory": "1.0.0-beta6",
+ "magento/module-customer": "1.0.0-beta6",
+ "magento/module-catalog-rule": "1.0.0-beta6",
+ "magento/module-eav": "1.0.0-beta6",
+ "magento/module-config": "1.0.0-beta6",
+ "magento/module-gift-message": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
+ "magento/module-quote": "1.0.0-beta6",
+ "magento/module-media-storage": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "suggest": {
- "magento/module-webapi": "1.0.0-beta5"
+ "magento/module-webapi": "1.0.0-beta6"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -3,16 +3,16 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "1.0.0-beta5",
- "magento/module-import-export": "1.0.0-beta5",
- "magento/module-catalog-import-export": "1.0.0-beta5",
- "magento/module-bundle": "1.0.0-beta5",
- "magento/module-eav": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-catalog": "1.0.0-beta6",
+ "magento/module-import-export": "1.0.0-beta6",
+ "magento/module-catalog-import-export": "1.0.0-beta6",
+ "magento/module-bundle": "1.0.0-beta6",
+ "magento/module-eav": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -3,12 +3,12 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-page-cache": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-page-cache": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -3,15 +3,15 @@
  "description": "N/A",
  "require": {
  "php": "~5.5.0|~5.6.0",
- "magento/module-store": "1.0.0-beta5",
- "magento/module-customer": "1.0.0-beta5",
- "magento/module-checkout": "1.0.0-beta5",
- "magento/module-backend": "1.0.0-beta5",
- "magento/framework": "1.0.0-beta5",
+ "magento/module-store": "1.0.0-beta6",
+ "magento/module-customer": "1.0.0-beta6",
+ "magento/module-checkout": "1.0.0-beta6",
+ "magento/module-backend": "1.0.0-beta6",
+ "magento/framework": "1.0.0-beta6",
  "magento/magento-composer-installer": "*"
  },
  "type": "magento2-module",
- "version": "1.0.0-beta5",
+ "version": "1.0.0-beta6",
  "license": [
  "OSL-3.0",
  "AFL-3.0"