Merge remote-tracking branch 'mainline/develop' into BUGS
Showing
- .htaccess 7 additions, 0 deletions.htaccess
- .htaccess.sample 7 additions, 0 deletions.htaccess.sample
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml 1 addition, 1 deletion...es/catalog/product/view/type/bundle/option/checkbox.phtml
- app/code/Magento/Cron/Model/Observer.php 10 additions, 1 deletionapp/code/Magento/Cron/Model/Observer.php
- app/code/Magento/Cron/Test/Unit/Model/ObserverTest.php 82 additions, 0 deletionsapp/code/Magento/Cron/Test/Unit/Model/ObserverTest.php
- app/code/Magento/Customer/Model/AccountManagement.php 2 additions, 1 deletionapp/code/Magento/Customer/Model/AccountManagement.php
- app/code/Magento/Customer/etc/data_source/customer_address.xml 1 addition, 1 deletion...ode/Magento/Customer/etc/data_source/customer_address.xml
- app/code/Magento/Developer/Model/Less/FileGenerator/PublicationDecorator.php 49 additions, 0 deletions...veloper/Model/Less/FileGenerator/PublicationDecorator.php
- app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php 13 additions, 5 deletions...ipping/Controller/Adminhtml/Order/Shipment/AddComment.php
- app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php 26 additions, 30 deletions...it/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
- app/etc/di.xml 9 additions, 17 deletionsapp/etc/di.xml
- dev/tests/functional/.htaccess 3 additions, 1 deletiondev/tests/functional/.htaccess
- dev/tools/Magento/Tools/Webdev/App/FileAssembler.php 21 additions, 5 deletionsdev/tools/Magento/Tools/Webdev/App/FileAssembler.php
- dev/tools/Magento/Tools/Webdev/file_assembler.php 3 additions, 3 deletionsdev/tools/Magento/Tools/Webdev/file_assembler.php
- lib/internal/Magento/Framework/Less/Config.php 26 additions, 0 deletionslib/internal/Magento/Framework/Less/Config.php
- lib/internal/Magento/Framework/Less/File/Temporary.php 52 additions, 0 deletionslib/internal/Magento/Framework/Less/File/Temporary.php
- lib/internal/Magento/Framework/Less/FileGenerator.php 32 additions, 91 deletionslib/internal/Magento/Framework/Less/FileGenerator.php
- lib/internal/Magento/Framework/Less/FileGenerator/RelatedGenerator.php 79 additions, 0 deletions...Magento/Framework/Less/FileGenerator/RelatedGenerator.php
- lib/internal/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php 90 additions, 76 deletions...al/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php
- lib/web/mage/backend/notification.js 1 addition, 1 deletionlib/web/mage/backend/notification.js
Please register or sign in to comment