Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-86337-magento-magento2-12752
Showing
- app/bootstrap.php 2 additions, 2 deletionsapp/bootstrap.php
- app/code/Magento/Backend/Model/Menu/Item.php 8 additions, 8 deletionsapp/code/Magento/Backend/Model/Menu/Item.php
- app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php 3 additions, 3 deletionsapp/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php
- app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_constructor_data.php 36 additions, 36 deletions...end/Test/Unit/Model/_files/menu_item_constructor_data.php
- app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_data.php 32 additions, 32 deletions...Magento/Backend/Test/Unit/Model/_files/menu_item_data.php
- app/code/Magento/Braintree/Gateway/Validator/ErrorCodeValidator.php 49 additions, 0 deletions...agento/Braintree/Gateway/Validator/ErrorCodeValidator.php
- app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php 15 additions, 4 deletions.../Braintree/Gateway/Validator/GeneralResponseValidator.php
- app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php 53 additions, 40 deletions...t/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
- app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php 13 additions, 46 deletions...t/Gateway/Validator/PaymentNonceResponseValidatorTest.php
- app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php 10 additions, 50 deletions...ree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
- app/code/Magento/Braintree/etc/adminhtml/braintree_error_mapping.xml 32 additions, 0 deletions...gento/Braintree/etc/adminhtml/braintree_error_mapping.xml
- app/code/Magento/Braintree/etc/adminhtml/di.xml 13 additions, 0 deletionsapp/code/Magento/Braintree/etc/adminhtml/di.xml
- app/code/Magento/Braintree/etc/braintree_error_mapping.xml 64 additions, 0 deletionsapp/code/Magento/Braintree/etc/braintree_error_mapping.xml
- app/code/Magento/Braintree/etc/di.xml 21 additions, 0 deletionsapp/code/Magento/Braintree/etc/di.xml
- app/code/Magento/Braintree/i18n/en_US.csv 62 additions, 0 deletionsapp/code/Magento/Braintree/i18n/en_US.csv
- app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js 1 addition, 0 deletions...w/frontend/web/js/view/payment/method-renderer/cc-form.js
- app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php 1 addition, 1 deletion...Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
- app/code/Magento/Catalog/Block/Product/ImageBuilder.php 8 additions, 3 deletionsapp/code/Magento/Catalog/Block/Product/ImageBuilder.php
- app/code/Magento/Catalog/Model/Product/Image.php 16 additions, 6 deletionsapp/code/Magento/Catalog/Model/Product/Image.php
- app/code/Magento/Catalog/Model/Product/Image/NotLoadInfoImageException.php 10 additions, 0 deletions...Catalog/Model/Product/Image/NotLoadInfoImageException.php
Please register or sign in to comment