Merge branch '2.2-develop' into 12110
Showing
- .htaccess 126 additions, 36 deletions.htaccess
- .htaccess.sample 128 additions, 37 deletions.htaccess.sample
- CHANGELOG.md 690 additions, 0 deletionsCHANGELOG.md
- README.md 4 additions, 2 deletionsREADME.md
- app/.htaccess 8 additions, 2 deletionsapp/.htaccess
- app/bootstrap.php 7 additions, 2 deletionsapp/bootstrap.php
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Analytics/composer.json 1 addition, 1 deletionapp/code/Magento/Analytics/composer.json
- app/code/Magento/Analytics/etc/di.xml 18 additions, 0 deletionsapp/code/Magento/Analytics/etc/di.xml
- app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/etc/adminhtml/di.xml 3 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml 8 additions, 3 deletions...ackend/view/adminhtml/templates/admin/access_denied.phtml
- app/code/Magento/Braintree/Block/Form.php 15 additions, 21 deletionsapp/code/Magento/Braintree/Block/Form.php
- app/code/Magento/Braintree/Block/Payment.php 4 additions, 0 deletionsapp/code/Magento/Braintree/Block/Payment.php
- app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetClientToken.php 73 additions, 0 deletions...Braintree/Controller/Adminhtml/Payment/GetClientToken.php
- app/code/Magento/Braintree/Controller/Payment/GetNonce.php 4 additions, 1 deletionapp/code/Magento/Braintree/Controller/Payment/GetNonce.php
- app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php 27 additions, 22 deletions...ento/Braintree/Gateway/Command/CaptureStrategyCommand.php
- app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php 10 additions, 9 deletions...ento/Braintree/Gateway/Command/GetPaymentNonceCommand.php
- app/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php 1 addition, 1 deletionapp/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php
Please register or sign in to comment