forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/native-password-hashing
* develop: (3965 commits) MAGETWO-31777: M2 GitHub Update (version 0.74.0-beta2) MAGETWO-31777: M2 GitHub Update (version 0.74.0-beta2) MAGETWO-35405: Magento\Multishipping\Controller\CheckoutTest::testOverviewAction is falied on Travis CI MAGETWO-35405: Magento\Multishipping\Controller\CheckoutTest::testOverviewAction is falied on Travis CI Change wording for long operation warning Fixed occurances of implode with wrong argument order MAGETWO-31086: M2 GitHub Update (version 0.74.0-beta1) MAGETWO-35411: [GITHUB] Incorrect use of implode() magento#1116 MAGETWO-35182: The link of "URL" type breaks "edit Downloadable" Backend page MAGETWO-31086: M2 GitHub Update (version 0.74.0-beta1) MAGETWO-18366: CLONE - Wrong capitalization of label names (sentence-style capitalization instead headline style) + Inconsistency in labels in the Admin Panel MAGETWO-35392: [GitHub] Google Analytics Script Minify problem magento#1114 MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35385: Fatal error when trying to send notify customer by email about shipment MAGETWO-35043: Tabs widget does not initialize sometimes on Product Creation page MAGETWO-35386: Blank email is sent when trying to change password for a customer ... Conflicts: dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
- Loading branch information
Showing
15,254 changed files
with
550,661 additions
and
562,666 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
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
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,172 +1,111 @@ | ||
| // # 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' | ||
|
|
||
| 'use strict'; | ||
| /** | ||
| * @copyright Copyright (c) 2015 X.commerce, Inc. (http://www.magentocommerce.com) | ||
| */ | ||
|
|
||
| // For performance use one level down: 'name/{,*/}*.js' | ||
| // If you want to recursively match all subfolders, use: 'name/**/*.js' | ||
| module.exports = function (grunt) { | ||
| 'use strict'; | ||
|
|
||
| // Require | ||
| // -------------------------------------- | ||
| var _ = require('underscore'), | ||
| path = require('path'); | ||
|
|
||
| // Time how long tasks take. Can help when optimizing build times | ||
| require('./dev/tools/grunt/tasks/mage-minify')(grunt); | ||
| require('time-grunt')(grunt); | ||
|
|
||
| // Load grunt tasks automatically | ||
| require('load-grunt-tasks')(grunt); | ||
|
|
||
| // Configurable paths and file names | ||
| // -------------------------------------- | ||
|
|
||
| var config = { | ||
| path: { | ||
| pub: 'pub', | ||
| var: 'var', | ||
| css: { | ||
| blank: 'pub/static/frontend/Magento/blank/en_US/css', | ||
| luma: 'pub/static/frontend/Magento/luma/en_US/css' | ||
| }, | ||
| less: { | ||
| lib: 'lib/web/css/', | ||
| blank: 'app/design/frontend/Magento/blank', | ||
| luma: 'app/design/frontend/luma' | ||
| }, | ||
| doc: 'lib/web/css/docs' | ||
| }, | ||
| doc: { | ||
| styleName: 'docs' | ||
| require('load-grunt-config')(grunt, { | ||
| configPath: path.join(process.cwd(), 'dev/tools/grunt/configs'), | ||
| init: true, | ||
| loadGruntTasks: { | ||
| pattern: [ | ||
| 'grunt-*', | ||
| '!grunt-template-jasmine-requirejs' | ||
| ] | ||
| } | ||
| }; | ||
|
|
||
| // Define the configuration for all the tasks | ||
| // -------------------------------------- | ||
|
|
||
| grunt.initConfig({ | ||
|
|
||
| // Project settings | ||
| config: config, | ||
| }); | ||
|
|
||
| // Watches files for changes and runs tasks based on the changed files | ||
| watch: { | ||
| less: { | ||
| files: [ | ||
| '<%= config.path.less.lib %>/{,*/}*.less', | ||
| '<%= config.path.less.blank %>/{,*/,*/*/,*/*/*/,*/*/*/*/}*.less', // ToDo UI: find out how to do it recursive | ||
| '<%= config.path.less.luma %>/{,*/,*/*/,*/*/*/,*/*/*/*/}*.less' | ||
| ], | ||
| tasks: ['styles'] | ||
| } | ||
| _.each({ | ||
| /** | ||
| * Assembling tasks. | ||
| * ToDo UI: define default tasks. | ||
| */ | ||
| default: function () { | ||
| grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/'); | ||
| }, | ||
|
|
||
| // Empties folders to start fresh | ||
| clean: { | ||
| var: { | ||
| files: [{ | ||
| dot: true, | ||
| src: [ | ||
| '<%= config.path.var %>/cache/*', | ||
| '<%= config.path.var %>/generation/*', | ||
| '<%= config.path.var %>/log/*', | ||
| '<%= config.path.var %>/maps/*', | ||
| '<%= config.path.var %>/page_cache/*', | ||
| '<%= config.path.var %>/tmp/*', | ||
| '<%= config.path.var %>/view/*', | ||
| '<%= config.path.var %>/view_preprocessed/*' | ||
| ] | ||
| }] | ||
| }, | ||
| pub: { | ||
| files: [{ | ||
| dot: true, | ||
| src: [ | ||
| '<%= config.path.pub %>/static/frontend/*', | ||
| '<%= config.path.pub %>/static/adminhtml/*' | ||
| ] | ||
| }] | ||
| /** | ||
| * Production preparation task. | ||
| */ | ||
| prod: function (component) { | ||
| if (component === 'setup') { | ||
| grunt.task.run([ | ||
| 'less:' + component, | ||
| 'autoprefixer:' + component, | ||
| 'cssmin:' + component, | ||
| 'usebanner:' + component | ||
| ]); | ||
| } | ||
| }, | ||
|
|
||
| // Compiles Less to CSS and generates necessary files if requested | ||
| less: { | ||
| options: { | ||
| sourceMap: true, | ||
| sourceMapRootpath: '/', | ||
| dumpLineNumbers: false, // use 'comments' instead false to output line comments for source | ||
| ieCompat: false | ||
| }, | ||
| blank: { | ||
| files: { | ||
| '<%= config.path.css.blank %>/styles-m.css': '<%= config.path.css.blank %>/styles-m.less', | ||
| '<%= config.path.css.blank %>/styles-l.css': '<%= config.path.css.blank %>/styles-l.less' | ||
| } | ||
| }, | ||
| luma: { | ||
| files: { | ||
| '<%= config.path.css.luma %>/styles-m.css': '<%= config.path.css.luma %>/styles-m.less', | ||
| '<%= config.path.css.luma %>/styles-l.css': '<%= config.path.css.luma %>/styles-l.less' | ||
| } | ||
| }, | ||
| documentation: { | ||
| files: { | ||
| '<%= config.path.doc %>/<%= config.doc.styleName %>.css': "<%= config.path.doc %>/source/<%= config.doc.styleName %>.less" | ||
| } | ||
| if (typeof component === 'undefined') { | ||
| grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing'); | ||
| } | ||
| }, | ||
|
|
||
| styledocco: { | ||
| documentation: { | ||
| options: { | ||
| name: 'Magento UI Library', | ||
| verbose: true, | ||
| include: [ | ||
| '<%= config.path.doc %>/<%= config.doc.styleName %>.css' | ||
| //'lib/web/jquery/jquery.min.js', | ||
| //'lib/web/jquery/jquery-ui.min', | ||
| //'<%= config.path.doc %>/source/js/dropdown.js' | ||
| ] | ||
| }, | ||
| files: { | ||
| '<%= config.path.doc %>': '<%= config.path.doc %>/source' // Todo UI: Check out JS for Styledocco | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Refresh magento frontend & backend. | ||
| */ | ||
| refresh: [ | ||
| 'exec:all', | ||
| 'less:blank', | ||
| 'less:luma', | ||
| 'less:backend' | ||
| ], | ||
| /** | ||
| * Styles for backend theme | ||
| */ | ||
| backend: [ | ||
| 'less:backend', | ||
| 'replace:escapeCalc', | ||
| 'less:override' | ||
| ], | ||
| /** | ||
| * Documentation | ||
| */ | ||
| documentation: [ | ||
| 'less:documentation', | ||
| 'styledocco:documentation', | ||
| 'clean:var', | ||
| 'clean:pub' | ||
| ], | ||
|
|
||
| spec: [ | ||
| 'specRunner:lib', | ||
| 'specRunner:backend', | ||
| 'specRunner:frontend' | ||
| ], | ||
|
|
||
| unit: [ | ||
| 'jasmine:lib-unit', | ||
| 'jasmine:backend-unit', | ||
| 'jasmine:frontend-unit' | ||
| ], | ||
|
|
||
| integration: [ | ||
| 'jasmine:lib-integration', | ||
| 'jasmine:backend-integration', | ||
| 'jasmine:frontend-integration' | ||
| ], | ||
|
|
||
| 'legacy-build': [ | ||
| 'mage-minify:legacy' | ||
| ], | ||
|
|
||
| 'documentation-banners': [ | ||
| 'usebanner:documentationCss', | ||
| 'usebanner:documentationLess', | ||
| 'usebanner:documentationHtml' | ||
| ] | ||
| }, function (task, name) { | ||
| grunt.registerTask(name, task); | ||
| }); | ||
|
|
||
| // Default task | ||
| // -------------------------------------- | ||
| grunt.registerTask('default', []); // ToDo UI: define default tasks | ||
|
|
||
| // Clean var & pub folders | ||
| grunt.registerTask('cleanup', [ | ||
| 'clean:var', | ||
| 'clean:pub' | ||
| ]); | ||
|
|
||
| // Compile all styles | ||
| // -------------------------------------- | ||
| grunt.registerTask('styles', [ | ||
| 'less:blank', | ||
| 'less:luma' | ||
| ]); | ||
|
|
||
| // Compile blank styles | ||
| grunt.registerTask('styles blank', [ | ||
| 'less:blank' | ||
| ]); | ||
|
|
||
| // Compile luma styles | ||
| grunt.registerTask('styles luma', [ | ||
| 'less:luma' | ||
| ]); | ||
|
|
||
| // Documentation | ||
| // -------------------------------------- | ||
| 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
Oops, something went wrong.