Merge remote-tracking branch 'mainline/develop' into MAGETWO-56317-2
Showing
- app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php 84 additions, 0 deletions...ee/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
- app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php 1 addition, 0 deletions...Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php 114 additions, 0 deletions...odel/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php 4 additions, 3 deletions.../Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
- app/code/Magento/Braintree/etc/adminhtml/di.xml 1 addition, 0 deletionsapp/code/Magento/Braintree/etc/adminhtml/di.xml
- app/code/Magento/Braintree/etc/config.xml 2 additions, 1 deletionapp/code/Magento/Braintree/etc/config.xml
- app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml 4 additions, 0 deletions...intree/view/adminhtml/layout/sales_order_create_index.xml
- app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml 4 additions, 0 deletions...l/layout/sales_order_create_load_block_billing_method.xml
- app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml 30 additions, 0 deletions...raintree/view/adminhtml/templates/form/paypal/vault.phtml
- app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml 2 additions, 1 deletion...gento/Braintree/view/adminhtml/templates/form/vault.phtml
- app/code/Magento/Braintree/view/adminhtml/web/js/vault.js 22 additions, 12 deletionsapp/code/Magento/Braintree/view/adminhtml/web/js/vault.js
- app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php 7 additions, 2 deletions...Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
- app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php 159 additions, 143 deletions.../Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml 1 addition, 1 deletion...templates/product/composite/fieldset/options/bundle.phtml
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php 3 additions, 1 deletion...to/Catalog/Controller/Adminhtml/Category/Image/Upload.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php 30 additions, 8 deletions...de/Magento/Catalog/Controller/Adminhtml/Category/Save.php
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 20 additions, 6 deletions...og/Controller/Adminhtml/Product/Initialization/Helper.php
- app/code/Magento/Catalog/Model/Category.php 5 additions, 5 deletionsapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php 49 additions, 15 deletions...agento/Catalog/Model/Category/Attribute/Backend/Image.php
- app/code/Magento/Catalog/Model/Category/DataProvider.php 28 additions, 5 deletionsapp/code/Magento/Catalog/Model/Category/DataProvider.php
Please register or sign in to comment