-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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](#742) -- Admin notifications count overflow
* [#720](#720) -- https filedriver is not working
* [#686](#686) -- Product save validation errors in the admin don't hide the overlay
* [#702](#702) -- Base table or view not found
* [#652](#652) -- Multishipping checkout not to change the Billing address js issue
* [#648](#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- Loading branch information
1 parent
fa214d8
commit e05a60c
Showing
3,325 changed files
with
141,285 additions
and
109,949 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -188,4 +188,3 @@ | |
| ## http://developer.yahoo.com/performance/rules.html#etags | ||
|
|
||
| #FileETag none | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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' | ||
| ]); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
app/code/Magento/AdminNotification/view/adminhtml/requirejs-config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| ] | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,4 +63,5 @@ define([ | |
| }); | ||
| }); | ||
|
|
||
| return $.mage.systemMessageDialog; | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.