Merge remote-tracking branch 'origin/2.2-develop' into feature-space-between-category-page
Showing
- app/bootstrap.php 2 additions, 2 deletionsapp/bootstrap.php
- 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/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml 1 addition, 1 deletion...minhtml/templates/catalog/product/attribute/options.phtml
- app/code/Magento/Catalog/view/adminhtml/web/js/options.js 7 additions, 1 deletionapp/code/Magento/Catalog/view/adminhtml/web/js/options.js
- app/code/Magento/Catalog/view/base/web/template/product/link.html 2 additions, 1 deletion.../Magento/Catalog/view/base/web/template/product/link.html
- app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php 6 additions, 0 deletions...uct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
- app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php 38 additions, 3 deletions...Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
- app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js 2 additions, 2 deletions...bleProduct/view/adminhtml/web/js/variations/variations.js
- app/code/Magento/Deploy/Console/Command/SetModeCommand.php 3 additions, 0 deletionsapp/code/Magento/Deploy/Console/Command/SetModeCommand.php
- app/code/Magento/Deploy/Model/Mode.php 19 additions, 0 deletionsapp/code/Magento/Deploy/Model/Mode.php
- app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php 12 additions, 0 deletions...o/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
- app/code/Magento/Paypal/Model/Express.php 6 additions, 1 deletionapp/code/Magento/Paypal/Model/Express.php
- app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php 10 additions, 1 deletionapp/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
- app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js 3 additions, 39 deletions.../Paypal/view/frontend/web/js/action/set-payment-method.js
- app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php 1 addition, 8 deletions...Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
- app/code/Magento/Sales/i18n/en_US.csv 0 additions, 1 deletionapp/code/Magento/Sales/i18n/en_US.csv
- app/code/Magento/Translation/Model/Js/DataProvider.php 3 additions, 3 deletionsapp/code/Magento/Translation/Model/Js/DataProvider.php
- app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php 1 addition, 1 deletionapp/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
- app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less 8 additions, 0 deletions...b/css/source/module/main/actions-bar/_store-switcher.less
- composer.json 1 addition, 0 deletionscomposer.json
Please register or sign in to comment