Merge remote-tracking branch 'mainline/develop' into MAGETWO-52660
Showing
- app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 2 deletionsapp/code/Magento/Braintree/etc/adminhtml/system.xml
- app/code/Magento/Braintree/view/adminhtml/web/styles.css 2 additions, 2 deletionsapp/code/Magento/Braintree/view/adminhtml/web/styles.css
- app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js 1 addition, 0 deletions...gento/Payment/view/frontend/web/js/view/payment/iframe.js
- app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php 8 additions, 9 deletions...Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
- app/code/Magento/Paypal/Model/Config.php 3 additions, 1 deletionapp/code/Magento/Paypal/Model/Config.php
- app/code/Magento/Paypal/Model/Express.php 4 additions, 10 deletionsapp/code/Magento/Paypal/Model/Express.php
- app/code/Magento/Paypal/Model/Payflow/Transparent.php 3 additions, 0 deletionsapp/code/Magento/Paypal/Model/Payflow/Transparent.php
- app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php 8 additions, 5 deletionsapp/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
- app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php 4 additions, 1 deletion...agento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
- app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml 1 addition, 1 deletion...Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
- app/code/Magento/Paypal/view/adminhtml/web/styles.css 4 additions, 5 deletionsapp/code/Magento/Paypal/view/adminhtml/web/styles.css
- app/code/Magento/Vault/Model/Method/Vault.php 1 addition, 1 deletionapp/code/Magento/Vault/Model/Method/Vault.php
- app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php 28 additions, 0 deletionsapp/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php 1 addition, 1 deletion.../Magento/Braintree/Test/Block/System/Config/Braintree.php
- dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php 1 addition, 1 deletion...pp/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
- dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php 1 addition, 1 deletion...p/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
- dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php 1 addition, 1 deletion...agento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php
- dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php 1 addition, 1 deletion...gento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php
- dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml 1 addition, 1 deletion.../Model/Config/Structure/Reader/_files/expected/config.xml
Please register or sign in to comment