Merge branch 'develop' into MAGETWO-36849
Showing
- app/code/Magento/Rule/Model/Resource/Rule/Collection/AbstractCollection.php 4 additions, 10 deletions...ule/Model/Resource/Rule/Collection/AbstractCollection.php
- app/code/Magento/Rule/Test/Unit/Model/Resource/Rule/Collection/AbstractCollectionTest.php 0 additions, 3 deletions...Model/Resource/Rule/Collection/AbstractCollectionTest.php
- app/code/Magento/Sales/Model/Resource/Order/Relation.php 3 additions, 2 deletionsapp/code/Magento/Sales/Model/Resource/Order/Relation.php
- app/code/Magento/Sales/etc/di.xml 24 additions, 4 deletionsapp/code/Magento/Sales/etc/di.xml
- app/code/Magento/SalesRule/Model/Plugin/Resource/Rule.php 39 additions, 0 deletionsapp/code/Magento/SalesRule/Model/Plugin/Resource/Rule.php
- app/code/Magento/SalesRule/Model/Plugin/Rule.php 22 additions, 0 deletionsapp/code/Magento/SalesRule/Model/Plugin/Rule.php
- app/code/Magento/SalesRule/Model/Resource/Rule.php 37 additions, 2 deletionsapp/code/Magento/SalesRule/Model/Resource/Rule.php
- app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php 21 additions, 2 deletions...code/Magento/SalesRule/Model/Resource/Rule/Collection.php
- app/code/Magento/SalesRule/Model/Rule.php 9 additions, 1 deletionapp/code/Magento/SalesRule/Model/Rule.php
- app/code/Magento/SalesRule/Test/Unit/Model/Plugin/Resource/RuleTest.php 62 additions, 0 deletions...to/SalesRule/Test/Unit/Model/Plugin/Resource/RuleTest.php
- app/code/Magento/SalesRule/Test/Unit/Model/Plugin/RuleTest.php 46 additions, 0 deletions...ode/Magento/SalesRule/Test/Unit/Model/Plugin/RuleTest.php
- app/code/Magento/SalesRule/Test/Unit/Model/Resource/RuleTest.php 138 additions, 0 deletions...e/Magento/SalesRule/Test/Unit/Model/Resource/RuleTest.php
- app/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php 73 additions, 0 deletionsapp/code/Magento/SalesRule/Test/Unit/Model/RuleTest.php
- app/code/Magento/SalesRule/etc/frontend/di.xml 15 additions, 0 deletionsapp/code/Magento/SalesRule/etc/frontend/di.xml
- app/code/Magento/Ui/Block/Logger.php 51 additions, 0 deletionsapp/code/Magento/Ui/Block/Logger.php
- app/code/Magento/Ui/Model/Config.php 55 additions, 0 deletionsapp/code/Magento/Ui/Model/Config.php
- app/code/Magento/Ui/etc/adminhtml/system.xml 24 additions, 0 deletionsapp/code/Magento/Ui/etc/adminhtml/system.xml
- app/code/Magento/Ui/etc/config.xml 17 additions, 0 deletionsapp/code/Magento/Ui/etc/config.xml
- app/code/Magento/Ui/view/base/layout/default.xml 14 additions, 0 deletionsapp/code/Magento/Ui/view/base/layout/default.xml
- app/code/Magento/Ui/view/base/templates/logger.phtml 24 additions, 0 deletionsapp/code/Magento/Ui/view/base/templates/logger.phtml
Please register or sign in to comment