Merge branch 'upstream-develop' into MAGETWO-51068-admin-session
Showing
- app/code/Magento/Backend/App/BackendAppList.php 1 addition, 0 deletionsapp/code/Magento/Backend/App/BackendAppList.php
- app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php 10 additions, 42 deletions...code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 2 additions, 1 deletion...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
- app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js 22 additions, 16 deletions...dle/view/adminhtml/web/js/components/bundle-input-type.js
- app/code/Magento/Catalog/Plugin/Block/Topmenu.php 39 additions, 19 deletionsapp/code/Magento/Catalog/Plugin/Block/Topmenu.php
- app/code/Magento/Catalog/Setup/UpgradeData.php 6 additions, 0 deletionsapp/code/Magento/Catalog/Setup/UpgradeData.php
- app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php 8 additions, 20 deletions...de/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php 1 addition, 2 deletions...g/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
- app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/frontend/events.xml 0 additions, 3 deletionsapp/code/Magento/Catalog/etc/frontend/events.xml
- app/code/Magento/CatalogInventory/Helper/Stock.php 23 additions, 2 deletionsapp/code/Magento/CatalogInventory/Helper/Stock.php
- app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php 0 additions, 1 deletion...ento/CatalogInventory/Model/Config/Backend/Backorders.php
- app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php 0 additions, 1 deletion...nto/CatalogInventory/Model/Config/Backend/Managestock.php
- app/code/Magento/CatalogInventory/Model/Configuration.php 3 additions, 1 deletionapp/code/Magento/CatalogInventory/Model/Configuration.php
- app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php 2 additions, 1 deletion...logInventory/Model/Plugin/AroundProductRepositorySave.php
- app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php 30 additions, 24 deletions...entory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
- app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php 7 additions, 3 deletions...de/Magento/CatalogInventory/Model/ResourceModel/Stock.php
- app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php 4 additions, 4 deletions...gento/CatalogInventory/Model/ResourceModel/Stock/Item.php
- app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php 28 additions, 1 deletion...odel/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
- app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php 26 additions, 3 deletions...nto/CatalogInventory/Model/ResourceModel/Stock/Status.php
Please register or sign in to comment