Merge remote-tracking branch 'mainline/develop' into MAGETWO-59215
# Conflicts: # composer.lock
Showing
- app/bootstrap.php 14 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/composer.json 1 addition, 1 deletionapp/code/Magento/Authorization/composer.json
- app/code/Magento/Authorizenet/composer.json 1 addition, 1 deletionapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 1 addition, 1 deletionapp/code/Magento/Backup/composer.json
- app/code/Magento/Braintree/composer.json 1 addition, 1 deletionapp/code/Magento/Braintree/composer.json
- app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js 0 additions, 1 deletion...ew/frontend/web/js/view/payment/method-renderer/paypal.js
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 7 additions, 14 deletions...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
- app/code/Magento/Bundle/composer.json 1 addition, 1 deletionapp/code/Magento/Bundle/composer.json
- app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js 59 additions, 0 deletions...w/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
- app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js 98 additions, 0 deletions...e/view/adminhtml/web/js/components/bundle-dynamic-rows.js
- app/code/Magento/BundleImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/BundleImportExport/composer.json
- app/code/Magento/CacheInvalidate/composer.json 1 addition, 1 deletionapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/Captcha/composer.json 1 addition, 1 deletionapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Model/Product.php 12 additions, 1 deletionapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/ProductRepository.php 1 addition, 0 deletionsapp/code/Magento/Catalog/Model/ProductRepository.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php 12 additions, 4 deletions...g/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php 2 additions, 1 deletion...talog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
Please register or sign in to comment