Merge branch 'MAGETWO-39705' of github.corp.ebay.com:magento-troll/magento2ce into bugfixes
Showing
- app/code/Magento/Authorizenet/Model/Authorizenet.php 49 additions, 17 deletionsapp/code/Magento/Authorizenet/Model/Authorizenet.php
- app/code/Magento/Authorizenet/Model/Directpost.php 34 additions, 26 deletionsapp/code/Magento/Authorizenet/Model/Directpost.php
- app/code/Magento/CatalogRule/Model/Rule.php 52 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php 114 additions, 4 deletionsapp/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php
- app/code/Magento/CatalogRule/i18n/de_DE.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/de_DE.csv
- app/code/Magento/CatalogRule/i18n/en_US.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/en_US.csv
- app/code/Magento/CatalogRule/i18n/es_ES.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/es_ES.csv
- app/code/Magento/CatalogRule/i18n/fr_FR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/fr_FR.csv
- app/code/Magento/CatalogRule/i18n/nl_NL.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/nl_NL.csv
- app/code/Magento/CatalogRule/i18n/pt_BR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/pt_BR.csv
- app/code/Magento/CatalogRule/i18n/zh_CN.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/zh_CN.csv
- app/code/Magento/CatalogRule/view/adminhtml/templates/promo/js.phtml 39 additions, 1 deletion...gento/CatalogRule/view/adminhtml/templates/promo/js.phtml
- app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php 28 additions, 3 deletions...code/Magento/Config/Model/Config/Backend/Admin/Custom.php
- app/code/Magento/Payment/Model/Method/AbstractMethod.php 2 additions, 0 deletionsapp/code/Magento/Payment/Model/Method/AbstractMethod.php
- app/code/Magento/Rule/Model/AbstractModel.php 9 additions, 9 deletionsapp/code/Magento/Rule/Model/AbstractModel.php
- app/code/Magento/Store/App/Response/Redirect.php 57 additions, 0 deletionsapp/code/Magento/Store/App/Response/Redirect.php
- app/code/Magento/Theme/view/adminhtml/page_layout/admin-login.xml 1 addition, 0 deletions.../Magento/Theme/view/adminhtml/page_layout/admin-login.xml
- app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php 28 additions, 1 deletion...lock/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
- app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/AbstractContainerTest.php 114 additions, 0 deletions...ml/Widget/Instance/Edit/Chooser/AbstractContainerTest.php
- app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/ContainerTest.php 440 additions, 0 deletions.../Adminhtml/Widget/Instance/Edit/Chooser/ContainerTest.php
Please register or sign in to comment