Merge branch 'develop' of github.com:magento/magento2ce into troll_p2
Showing
- app/bootstrap.php 3 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/composer.json 1 addition, 1 deletionapp/code/Magento/Authorization/composer.json
- app/code/Magento/Authorizenet/composer.json 1 addition, 1 deletionapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml 1 addition, 1 deletion...inhtml/templates/system/shipping/applicable_country.phtml
- app/code/Magento/Backup/composer.json 1 addition, 1 deletionapp/code/Magento/Backup/composer.json
- app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php 4 additions, 0 deletions...ode/Magento/Braintree/Model/Report/Row/TransactionMap.php
- app/code/Magento/Braintree/Model/Ui/ConfigProvider.php 0 additions, 1 deletionapp/code/Magento/Braintree/Model/Ui/ConfigProvider.php
- app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php 61 additions, 1 deletion...o/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php 38 additions, 0 deletions...ree/Test/Unit/Model/Report/TransactionsCollectionTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php 0 additions, 1 deletion...gento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
- app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php 251 additions, 0 deletions...t/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
- app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php 19 additions, 0 deletions.../Braintree/Ui/Component/Report/Filters/Type/DateRange.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php 6 additions, 6 deletions...intree/Ui/Component/Report/Listing/Column/PaymentType.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php 14 additions, 14 deletions...o/Braintree/Ui/Component/Report/Listing/Column/Status.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php 2 additions, 2 deletions...ee/Ui/Component/Report/Listing/Column/TransactionType.php
- app/code/Magento/Braintree/composer.json 2 additions, 1 deletionapp/code/Magento/Braintree/composer.json
- app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 1 deletionapp/code/Magento/Braintree/etc/adminhtml/system.xml
Please register or sign in to comment