Merge remote-tracking branch 'magento-firedrakes/MAGETWO-34378' into MAGETWO-35906
Showing
- app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php 51 additions, 27 deletionsapp/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
- app/code/Magento/Cms/Setup/InstallData.php 9 additions, 11 deletionsapp/code/Magento/Cms/Setup/InstallData.php
- app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php 256 additions, 66 deletions...agento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
- app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php 10 additions, 2 deletions...e/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
- app/code/Magento/Payment/Model/Method/Adapter.php 8 additions, 1 deletionapp/code/Magento/Payment/Model/Method/Adapter.php
- app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html 4 additions, 3 deletions...o/Payment/view/frontend/web/template/payment/cc-form.html
- app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html 1 addition, 1 deletion...to/Payment/view/frontend/web/template/payment/iframe.html
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml 16 additions, 1 deletionapp/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml 26 additions, 1 deletionapp/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml 10 additions, 0 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml 6 additions, 0 deletions...code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml 42 additions, 4 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
- app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js 30 additions, 0 deletions...de/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
- app/code/Magento/Sales/Model/Order/Payment.php 9 additions, 3 deletionsapp/code/Magento/Sales/Model/Order/Payment.php
Please register or sign in to comment