Merge branch 'develop_mainline' into PR_Branch

Conflicts: composer.lock
magento · Apr 7, 2015 · d95c3ea · d95c3ea
2 parents f0bbf2e + 09cadae
commit d95c3ea
Show file tree

Hide file tree

Showing 104 changed files with 1,001 additions and 816 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,34 @@
+0.74.0-beta3
+=============
+* API
+   * The orders were extended with the gift messages
+   * The page and block data and repository interfaces
+   * Updated the public API list
+* Framework improvements
+    * Improved the profile generator 
+    * Introduced the new environment for Jasmine tests
+* Design
+    * Inverted the new admin area styles scope, clean up the old styles
+    * New Side Panels on Admin Area
+* Various
+    * Asynchronous indexing for sales grids
+    * Advanced Mini Cart
+    * The HTML minification management on Admin Area
+    * Minor UI improvements
+    * The GitHub contribution process was updated in the README.md file
+* Fixed bugs
+    * Fixed the assets deployment tool with the minification
+    * Fixed the JMeter scenario for the performance toolkit
+    * Fixed the static files caching on Varnish
+    * Fixed Admin user creation with the duplicated email or name (incorrect URL)
+    * Fixed the link on Reset password email for secure URL case
+    * Fixed the configured product adding from the wish-list to shopping cart
+    * Fixed the long labels display on Admin Area
+    * Fixed the Navigation Menu items on Admin Area
+    * Various unit and integration tests bugs
+* GitHub issues and requests
+    [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
+
 0.74.0-beta2
 =============
 * 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": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-media-storage": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/module-media-storage": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "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": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

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": "0.74.0-beta2",
-        "magento/module-directory": "0.74.0-beta2",
-        "magento/module-developer": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-cron": "0.74.0-beta2",
-        "magento/module-theme": "0.74.0-beta2",
-        "magento/module-reports": "0.74.0-beta2",
-        "magento/module-sales": "0.74.0-beta2",
-        "magento/module-quote": "0.74.0-beta2",
-        "magento/module-catalog": "0.74.0-beta2",
-        "magento/module-user": "0.74.0-beta2",
-        "magento/module-backup": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-translation": "0.74.0-beta2",
-        "magento/module-require-js": "0.74.0-beta2",
-        "magento/module-config": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-directory": "0.74.0-beta3",
+        "magento/module-developer": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-cron": "0.74.0-beta3",
+        "magento/module-theme": "0.74.0-beta3",
+        "magento/module-reports": "0.74.0-beta3",
+        "magento/module-sales": "0.74.0-beta3",
+        "magento/module-quote": "0.74.0-beta3",
+        "magento/module-catalog": "0.74.0-beta3",
+        "magento/module-user": "0.74.0-beta3",
+        "magento/module-backup": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-translation": "0.74.0-beta3",
+        "magento/module-require-js": "0.74.0-beta3",
+        "magento/module-config": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -154,13 +154,6 @@
             <label>Developer</label>
             <tab>advanced</tab>
             <resource>Magento_Backend::dev</resource>
-            <group id="restrict" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Developer Client Restrictions</label>
-                <field id="allow_ips" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Allowed IPs (comma separated)</label>
-                    <comment>Leave empty for access from any location.</comment>
-                </field>
-            </group>
             <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
                 <label>Debug</label>
                 <field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">

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": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-cron": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/module-cron": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

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": "0.74.0-beta2",
-        "magento/module-catalog": "0.74.0-beta2",
-        "magento/module-tax": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-sales": "0.74.0-beta2",
-        "magento/module-checkout": "0.74.0-beta2",
-        "magento/module-catalog-inventory": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-catalog-rule": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-config": "0.74.0-beta2",
-        "magento/module-gift-message": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
-        "magento/module-quote": "0.74.0-beta2",
-        "magento/module-media-storage": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-catalog": "0.74.0-beta3",
+        "magento/module-tax": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/module-sales": "0.74.0-beta3",
+        "magento/module-checkout": "0.74.0-beta3",
+        "magento/module-catalog-inventory": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-catalog-rule": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-config": "0.74.0-beta3",
+        "magento/module-gift-message": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
+        "magento/module-quote": "0.74.0-beta3",
+        "magento/module-media-storage": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "0.74.0-beta2"
+        "magento/module-webapi": "0.74.0-beta3"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "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": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-checkout": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-checkout": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -3,37 +3,37 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-cms": "0.74.0-beta2",
-        "magento/module-indexer": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-theme": "0.74.0-beta2",
-        "magento/module-checkout": "0.74.0-beta2",
-        "magento/module-log": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-widget": "0.74.0-beta2",
-        "magento/module-wishlist": "0.74.0-beta2",
-        "magento/module-tax": "0.74.0-beta2",
-        "magento/module-msrp": "0.74.0-beta2",
-        "magento/module-catalog-inventory": "0.74.0-beta2",
-        "magento/module-directory": "0.74.0-beta2",
-        "magento/module-catalog-rule": "0.74.0-beta2",
-        "magento/module-product-alert": "0.74.0-beta2",
-        "magento/module-url-rewrite": "0.74.0-beta2",
-        "magento/module-catalog-url-rewrite": "0.74.0-beta2",
-        "magento/module-page-cache": "0.74.0-beta2",
-        "magento/module-quote": "0.74.0-beta2",
-        "magento/module-config": "0.74.0-beta2",
-        "magento/module-media-storage": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-cms": "0.74.0-beta3",
+        "magento/module-indexer": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-theme": "0.74.0-beta3",
+        "magento/module-checkout": "0.74.0-beta3",
+        "magento/module-log": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/module-widget": "0.74.0-beta3",
+        "magento/module-wishlist": "0.74.0-beta3",
+        "magento/module-tax": "0.74.0-beta3",
+        "magento/module-msrp": "0.74.0-beta3",
+        "magento/module-catalog-inventory": "0.74.0-beta3",
+        "magento/module-directory": "0.74.0-beta3",
+        "magento/module-catalog-rule": "0.74.0-beta3",
+        "magento/module-product-alert": "0.74.0-beta3",
+        "magento/module-url-rewrite": "0.74.0-beta3",
+        "magento/module-catalog-url-rewrite": "0.74.0-beta3",
+        "magento/module-page-cache": "0.74.0-beta3",
+        "magento/module-quote": "0.74.0-beta3",
+        "magento/module-config": "0.74.0-beta3",
+        "magento/module-media-storage": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-cookie": "0.74.0-beta2"
+        "magento/module-cookie": "0.74.0-beta3"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-catalog": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-import-export": "0.74.0-beta2",
-        "magento/module-indexer": "0.74.0-beta2",
-        "magento/module-store": "0.74.0-beta2",
-        "magento/module-catalog-inventory": "0.74.0-beta2",
-        "magento/module-media-storage": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-catalog": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-import-export": "0.74.0-beta3",
+        "magento/module-indexer": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-catalog-inventory": "0.74.0-beta3",
+        "magento/module-media-storage": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "ext-ctype": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-config": "0.74.0-beta2",
-        "magento/module-store": "0.74.0-beta2",
-        "magento/module-catalog": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-indexer": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-quote": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-config": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-catalog": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-indexer": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-quote": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta2",
-        "magento/module-rule": "0.74.0-beta2",
-        "magento/module-catalog": "0.74.0-beta2",
-        "magento/module-customer": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-eav": "0.74.0-beta2",
-        "magento/module-indexer": "0.74.0-beta2",
-        "magento/module-import-export": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta3",
+        "magento/module-rule": "0.74.0-beta3",
+        "magento/module-catalog": "0.74.0-beta3",
+        "magento/module-customer": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta3",
+        "magento/module-eav": "0.74.0-beta3",
+        "magento/module-indexer": "0.74.0-beta3",
+        "magento/module-import-export": "0.74.0-beta3",
+        "magento/framework": "0.74.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"