magento
diff --git a/‎.gitignore
+2-2 b/‎.gitignore
+2-2
diff --git a/‎.htaccess
-1 b/‎.htaccess
-1
diff --git a/‎CHANGELOG.md
+88-1 b/‎CHANGELOG.md
+88-1
diff --git a/‎Gruntfile.js
+105 b/‎Gruntfile.js
+105
diff --git a/‎app/code/Magento/AdminNotification/Model/Feed.php
+7-7 b/‎app/code/Magento/AdminNotification/Model/Feed.php
+7-7
diff --git a/‎app/code/Magento/AdminNotification/Model/System/Message/Security.php
+1-1 b/‎app/code/Magento/AdminNotification/Model/System/Message/Security.php
+1-1
diff --git a/‎app/code/Magento/AdminNotification/composer.json
+5-5 b/‎app/code/Magento/AdminNotification/composer.json
+5-5
diff --git a/‎app/code/Magento/AdminNotification/etc/module.xml
+1-1 b/‎app/code/Magento/AdminNotification/etc/module.xml
+1-1
diff --git a/‎app/code/Magento/AdminNotification/view/adminhtml/requirejs-config.js
+33 b/‎app/code/Magento/AdminNotification/view/adminhtml/requirejs-config.js
+33
diff --git a/‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+1-1 b/‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+1-1
diff --git a/‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js
+1 b/‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js
+1
diff --git a/‎app/code/Magento/Authorization/Model/Resource/Setup.php
+1-1 b/‎app/code/Magento/Authorization/Model/Resource/Setup.php
+1-1
diff --git a/‎app/code/Magento/Authorization/composer.json
+3-3 b/‎app/code/Magento/Authorization/composer.json
+3-3
@@ -9,8 +9,7 @@ atlassian*
 /.idea
 /.gitattributes
 /app/config_sandbox
-/app/etc/local.xml
-/app/etc/*/module.xml
+/app/etc/config.php
 /lib/internal/flex/uploader/.actionScriptProperties
 /lib/internal/flex/uploader/.flexProperties
 /lib/internal/flex/uploader/.project
@@ -19,6 +18,7 @@ atlassian*
 /lib/internal/flex/varien/.flexLibProperties
 /lib/internal/flex/varien/.project
 /lib/internal/flex/varien/.settings
+/node_modules
 
 /pub/media/*.*
 !/pub/media/.htaccess
 
@@ -188,4 +188,3 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
-
@@ -1,3 +1,90 @@
+0.1.0-alpha106
+=============
+* Various improvements:
+    * Refactored Service Layer of the Magento_Tax Module
+    * Stabilized functional tests for the Backend module
+    * Stabilized functional tests for the CatalogRule module
+    * Stabilized functional tests for the Checkout module
+    * Stabilized functional tests for the CurrencySymbol module
+    * Stabilized functional tests for the Shipping module
+    * Stabilized functional tests for the Tax module
+    * Stabilized functional tests for the User module
+* Added Readme.md files to the following modules:
+    * Magento\RequireJs
+    * Magento\Ui
+* Fixed bugs:
+    * Fixed an issue where product image assignment to a store view was not considered when displaying a product
+    * Fixed shipping address area blinking when billing address is filled during checkout with a virtual product
+    * Fixed an issue where filter_store.html was not found
+    * Fixed an issue where the customer account access menu did not expand on the storefront
+    * Fixed an issue where CMS blocks did not open when clicking from a grid
+    * Fixed an issue where the Create Product page was completely blocked after closing the New Attribute pop-up
+    * Fixed an issue where Stock Status was disabled for Bundle and Grouped products
+    * Fixed an issue where a product could not be saved without filling a not required bundle option
+    * Fixed broken "per page" selectors on the Customer's account pages
+    * Fixed the wrong behavior of JS loaders on the storefront pages
+    * Fixed Shopping cart price rule form validation
+    * Fixed an issue where the 'Please wait' spinner persisted when creating a customer custom attribute with existing code
+    * Fixed a Google Chrome specific issue where subcategories were not displayed correctly on the first hover for category item
+    * Fixed an issue where the 'Please wait' spinner did not disappear when creating customer with invalid email
+    * Fixed an issue where the Username field auto-focus on admin login page revealed password in case of fast typing
+    * Fixed an issue where Bundle Product original Price was not displayed in case of discount
+    * Fixed wrong discount calculation for bundle options
+    * Fixed an issue where wrong discount and total amounts were displayed on the order creation page when reordering an order with a bundle product in the Admin panel
+    * Fixed an issue where admin tax notifications did not appear/disappear unless cache was flushed or disabled
+    * Fixed an issue where catalog price and shopping cart price did not match when display currency was different from the base currency
+    * Fixed an issue where Tax classes did not allow 'None' as a valid 'product tax class'
+    * Fixed an issue where token-based authentication did not work if compilation was enabled
+    * Fixed the sample code in index.php illustrating multi websites set up
+    * Fixed commands in Setup CLI to match the ones displayed in help
+    * Fixed an issue where searching by a part of a product name in Advanced Search did not give correct results
+    * Fixed an issue where 404 page is displayed after Search Term mass deletion
+    * Fixed an issue where Popular Search Terms were not displayed on the storefront
+    * Fixed an issue where it was impossible to add Gift Message during one page checkout
+    * Fixed an issue where the optional Postal code setting did not work correctly
+    * Fixed an issue where product price details were missing in summary block in the shopping cart when the Back to shopping cart link was clicked on multishipping page
+    * Fixed an issue where the 404 error page was displayed instead of the Index Management page after saving mass update
+    * Fixed an issue where the "Out of Stock" message was not displayed for a bundle product when there was not enough of one of the associated products in stock
+    * Fixed an issue with the Newsletters Report page in the Admin panel
+    * Fixed an issue where Catalog price rule was not applying correct rates on specific products
+    * Fixed an issue where a fatal error was thrown after clicking a link to a downloadable product
+    * Fixed an issue a warning page for Grouped product with enabled MAP
+    * Fixed an issue where a configurable product was not displayed in catalog product grid after updating with "Add configurable attributes to the new set based on current"
+    * Fixed the inconsistent behavior in the integration tests for the Indexer functionality
+    * Fixed an issue where the What's this? information tip link was not presented on product page with configured Minimum Advertised Price (MAP)
+* Processed GitHub requests:
+    * [#742](https://github.com/magento/magento2/issues/742) -- Admin notifications count overflow
+    * [#720](https://github.com/magento/magento2/issues/720) -- https filedriver is not working
+    * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
+    * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
+    * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+* Service Contracts:
+    * Refactored usage of new API of the Customer module
+    * Implemented Service Contracts for the Sales module
+    * Refactored Service Contracts for the Catalog module
+    * Refactored Service Contracts for the Grouped module
+* UI Improvements:
+    * Implemented the Form component in Magento UI Library
+    * Removed extra JS loaders for category saving
+    * Improved the behavior of Categories management in the Admin panel
+    * Implemented the keyboard navigation through HTML elements
+    * Improved the HTML structure and UI of the Catalog Category Link, Catalog Product Link and CMS Static Block widgets
+    * Added UI Library documentation
+    * Fixed Blank & Luma themes UI bugs
+    * Fixed footer alignment
+    * Published the Luma theme and removed the Plushe theme
+* Framework Improvements:
+    * Added the ability to configure the list of loaded modules before installation
+    * Merged SQL and Data Upgrades
+    * Moved \Magento\TestFramework\Utility\Files to Magento Framework
+* Setup tool improvements:
+    * Removed duplication with Framework
+    * Deployment configuration is refactored from XML format in local.xml to associated array in config.php
+    * Improved performance
+* Search improvements:
+    * Integrated the Full Text Search library into the Layered Navigation functionality
+
 0.1.0-alpha105
 =============
 * Various improvements:
@@ -1891,7 +1978,7 @@
   * LESS styles library added in pub/lib/css/
   * A new Blank theme set as default
 * GitHub requests:
-  * [#491](https://github.com/magento/magento2/pull/491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, é, ä, and other).
+  * [#491](https://github.com/magento/magento2/pull/491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, e, a, and other).
   * [#480](https://github.com/magento/magento2/pull/480) -- Fixing a bug for loading config from local.xml
   * [#472](https://github.com/magento/magento2/issues/472) -- Params passed in pub/index.php being overwritten
   * [#461](https://github.com/magento/magento2/pull/461) -- Use translates for Quote\Address\Total\Shipping
 
@@ -0,0 +1,105 @@
+// # Globbing
+// for performance reasons we're only matching one level down:
+// 'test/spec/{,*/}*.js'
+// If you want to recursively match all subfolders, use:
+// 'test/spec/**/*.js'
+
+module.exports = function (grunt) {
+
+    // Time how long tasks take. Can help when optimizing build times
+    require('time-grunt')(grunt);
+
+    // Load grunt tasks automatically
+    require('load-grunt-tasks')(grunt);
+
+    // Configurable paths and file names
+    var config = {
+        pub: 'pub',
+        var: 'var',
+        doc: {
+            path: 'lib/web/css/docs',
+            styleName: 'docs'
+        }
+    };
+
+    // Define the configuration for all the tasks
+    grunt.initConfig({
+
+        // Project settings
+        config: config,
+
+        // Empties folders to start fresh
+        clean: {
+            var: {
+                files: [{
+                    dot: true,
+                    src: [
+                        '<%= config.var %>/cache/*',
+                        '<%= config.var %>/generation/*',
+                        '<%= config.var %>/log/*',
+                        '<%= config.var %>/maps/*',
+                        '<%= config.var %>/page_cache/*',
+                        '<%= config.var %>/tmp/*',
+                        '<%= config.var %>/view/*',
+                        '<%= config.var %>/view_preprocessed/*'
+                    ]
+                }]
+            },
+            pub: {
+                files: [{
+                    dot: true,
+                    src: [
+                        '<%= config.pub %>/static/frontend/*',
+                        '<%= config.pub %>/static/adminhtml/*'
+                    ]
+                }]
+            }
+        },
+
+        // Compiles Less to CSS and generates necessary files if requested
+        less: {
+            documentation: {
+                options: {
+                    sourceMap: false,
+                    ieCompat: false,
+                    paths: ['<%= config.doc.path %>/source/']
+                },
+                files: {
+                    '<%= config.doc.path %>/<%= config.doc.styleName %>.css': "<%= config.doc.path %>/source/<%= config.doc.styleName %>.less"
+                }
+            }
+        },
+
+        styledocco: {
+            documentation: {
+                options: {
+                    name: 'Magento UI Library',
+                    verbose: true,
+                    include: [
+                        '<%= config.doc.path %>/<%= config.doc.styleName %>.css',
+                        'lib/web/jquery/jquery.min.js',
+                        'lib/web/jquery/jquery-ui.min',
+                        '<%= config.doc.path %>/source/js/dropdown.js'
+                    ]
+                },
+                files: {
+                    '<%= config.doc.path %>': '<%= config.doc.path %>/source'
+                }
+            }
+        }
+
+    });
+
+    grunt.registerTask('default', []);
+
+    grunt.registerTask('cleanup', [
+        'clean:var',
+        'clean:pub'
+    ]);
+
+    grunt.registerTask('documentation', [
+        'less:documentation',
+        'styledocco:documentation',
+        'cleanup'
+    ]);
+};
@@ -62,19 +62,19 @@ class Feed extends \Magento\Framework\Model\AbstractModel
     protected $curlFactory;
 
     /**
-     * Application arguments
+     * Deployment configuration
      *
-     * @var \Magento\Framework\App\Arguments
+     * @var \Magento\Framework\App\DeploymentConfig
      */
-    protected $_args;
+    protected $_deploymentConfig;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
-     * @param \Magento\Framework\App\Arguments $args
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param \Magento\Framework\HTTP\Adapter\curlFactory $curlFactory
      * @param array $data
@@ -85,7 +85,7 @@ public function __construct(
         \Magento\Backend\App\ConfigInterface $backendConfig,
         \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
         \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory,
-        \Magento\Framework\App\Arguments $args,
+        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = array()
@@ -94,7 +94,7 @@ public function __construct(
         $this->_backendConfig = $backendConfig;
         $this->_inboxFactory = $inboxFactory;
         $this->curlFactory = $curlFactory;
-        $this->_args = $args;
+        $this->_deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -135,7 +135,7 @@ public function checkUpdate()
 
         $feedXml = $this->getFeedData();
 
-        $installDate = strtotime($this->_args->get('install_date'));
+        $installDate = strtotime($this->_deploymentConfig->get('install/date'));
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {
 
@@ -35,7 +35,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface
      *
      * @var string
      */
-    private $_filePath = 'app/etc/local.xml';
+    private $_filePath = 'app/etc/config.php';
 
     /**
      * Time out for HTTP verification request
 
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha105",
-        "magento/module-core": "0.1.0-alpha105",
-        "magento/module-backend": "0.1.0-alpha105",
-        "magento/framework": "0.1.0-alpha105",
+        "magento/module-store": "0.1.0-alpha106",
+        "magento/module-core": "0.1.0-alpha106",
+        "magento/module-backend": "0.1.0-alpha106",
+        "magento/framework": "0.1.0-alpha106",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha105",
+    "version": "0.1.0-alpha106",
     "extra": {
         "map": [
             [
 
@@ -24,7 +24,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_AdminNotification" schema_version="2.0.0.0" active="true">
+    <module name="Magento_AdminNotification" schema_version="2.0.0.0">
         <sequence>
             <module name="Magento_Core"/>
             <module name="Magento_Store"/>
 
@@ -0,0 +1,33 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+
+var config = {
+    map: {
+        '*': {
+            systemMessageDialog: 'Magento_AdminNotification/system/notification'
+        }
+    },
+    deps: [
+        "Magento_AdminNotification/toolbar_entry"
+    ]
+};
@@ -26,7 +26,7 @@
 <?php $notificationCount = $this->getUnreadNotificationCount(); ?>
 <div class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
     <?php if ($notificationCount > 0) : ?>
-        <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
+        <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
             <span class="text"><?php echo __('Notifications'); ?></span>
             <span class="counter qty"><?php echo $this->escapeHtml($notificationCount); ?></span>
         </a>
 
@@ -63,4 +63,5 @@ define([
         });
     });
 
+    return $.mage.systemMessageDialog;
 });
@@ -29,7 +29,7 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Setup extends \Magento\Framework\Module\Setup
+class Setup extends \Magento\Framework\Module\DataSetup
 {
     /**
      * Role model factory
 
@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha105",
-        "magento/framework": "0.1.0-alpha105",
+        "magento/module-backend": "0.1.0-alpha106",
+        "magento/framework": "0.1.0-alpha106",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha105",
+    "version": "0.1.0-alpha106",
     "extra": {
         "map": [
             [
Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,3 @@`
`188`	`188`	`## http://developer.yahoo.com/performance/rules.html#etags`
`189`	`189`
`190`	`190`	`#FileETag none`
`191`		`-`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface`
`35`	`35`	`*`
`36`	`36`	`* @var string`
`37`	`37`	`*/`
`38`		`- private $_filePath = 'app/etc/local.xml';`
	`38`	`+ private $_filePath = 'app/etc/config.php';`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Time out for HTTP verification request`
-Original file line number
+Diff line change
         });
     });
 +    return $.mage.systemMessageDialog;
 });
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* @SuppressWarnings(PHPMD.LongVariable)`
`30`	`30`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`31`	`31`	`*/`
`32`		`-class Setup extends \Magento\Framework\Module\Setup`
	`32`	`+class Setup extends \Magento\Framework\Module\DataSetup`
`33`	`33`	`{`
`34`	`34`	`/**`
`35`	`35`	`* Role model factory`