Merge branch 'develop' into MAGETWO-34644

Conflicts:
	app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
	app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
	app/code/Magento/Sales/Setup/UpgradeSchema.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
	app/code/Magento/Sales/etc/di.xml
	app/code/Magento/Sales/etc/events.xml

Author: Dmytro Voskoboinikov

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

Gruntfile.js

@@ -66,14 +66,6 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
-        /**
-         * Styles for backend theme
-         */
-        backend: [
-            'less:backend',
-            'replace:escapeCalc',
-            'less:override'
-        ],
         /**
          * Documentation
          */

README.md

@@ -27,7 +27,7 @@ Use the following table to verify you have the correct prerequisites to install
 		</tr>
 	<tr>
 		<td>Apache 2.2 or 2.4</td>
-		<td>Ubuntu: <code>apache -v</code><br>
+		<td>Ubuntu: <code>apache2 -v</code><br>
 		CentOS: <code>httpd -v</code></td>
 		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
@@ -57,3 +57,17 @@ After verifying your prerequisites, perform the following tasks in order to prep
 	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
 	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
 2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a>
+
+<h2>Contributing to the Magento 2 code base</h2>
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
+
+To make learn about how to make a contribution, click [here][1].
+
+To learn about issues, click [here][2]. To open an issue, click [here][3].
+
+To suggest documentation improvements, click [here][4].
+
+[1]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html>
+[2]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#report>
+[3]: <https://github.com/magento/magento2/issues>
+[4]: <http://devdocs.magento.com>

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"

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -12,7 +12,7 @@
  * @see \Magento\AdminNotification\Block\Window
  */
 ?>
-<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
+<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
     <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
         <div class="popup-inner">
             <div class="popup-header">

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
 
 <?php $lastCritical = $block->getLastCritical();?>
-<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?> admin__scope">
+<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
     <div class="message-system-inner">
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
     <ul class="message-system-list">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?php echo $block->getItemClass($message);?>">

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -20,9 +20,7 @@ define([
         },
 
         open: function (severity) {
-            var superMethod = $.proxy(this._super, this),
-                listTemplate,
-                fullTemplate;
+            var superMethod = $.proxy(this._super, this);
 
             $.ajax({
                 url: this.options.ajaxUrl,
@@ -38,12 +36,12 @@ define([
                 });
 
                 tmpl = $(tmpl);
-                listTemplate = $('<ul class="message-system-list"></ul>').append(tmpl);
-                fullTemplate = $('<div class="admin__scope"></div>').append(listTemplate);
 
-                this.element
-                    .html(fullTemplate)
-                    .trigger('contentUpdated');
+                this.element.html(
+                    $('<ul />', {
+                        'class': 'message-system-list'
+                    }).append(tmpl)
+                ).trigger('contentUpdated');
 
                 superMethod();
             }, this));

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"

app/code/Magento/Backend/App/Action/Context.php

@@ -61,6 +61,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Auth $auth
@@ -81,6 +82,7 @@ public function __construct(
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Auth $auth,
@@ -99,7 +101,8 @@ public function __construct(
             $redirect,
             $actionFlag,
             $view,
-            $messageManager
+            $messageManager,
+            $resultRedirectFactory
         );
 
         $this->_session = $session;