Merge remote-tracking branch 'main/develop' into MAGETWO-49845
Showing
- Gruntfile.js.sample 0 additions, 0 deletionsGruntfile.js.sample
- app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php 3 additions, 3 deletions...ancedPricingImportExport/Model/Export/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 52 additions, 21 deletions...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php 334 additions, 94 deletions...portExport/Test/Unit/Model/Import/AdvancedPricingTest.php
- app/code/Magento/Backend/Model/Auth/Session.php 2 additions, 15 deletionsapp/code/Magento/Backend/Model/Auth/Session.php
- app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php 36 additions, 0 deletions...nto/Backend/Model/Config/SessionLifetime/BackendModel.php
- app/code/Magento/Backend/Model/Session/AdminConfig.php 10 additions, 2 deletionsapp/code/Magento/Backend/Model/Session/AdminConfig.php
- app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php 0 additions, 60 deletions...code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
- app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php 43 additions, 0 deletions...st/Unit/Model/Config/SessionLifetime/BackendModelTest.php
- app/code/Magento/Backend/etc/adminhtml/system.xml 2 additions, 1 deletionapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backend/i18n/en_US.csv 3 additions, 1 deletionapp/code/Magento/Backend/i18n/en_US.csv
- app/code/Magento/Backend/view/adminhtml/layout/default.xml 1 addition, 1 deletionapp/code/Magento/Backend/view/adminhtml/layout/default.xml
- app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php 1 addition, 0 deletions...Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
- app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php 1 addition, 14 deletions...code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
- app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php 2 additions, 2 deletions...o/BundleImportExport/Model/Import/Product/Type/Bundle.php
- app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php 37 additions, 12 deletions...Export/Test/Unit/Model/Import/Product/Type/BundleTest.php
- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php 28 additions, 19 deletionsapp/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php 15 additions, 0 deletions...Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
- app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php 77 additions, 0 deletions...de/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category.php 51 additions, 0 deletionsapp/code/Magento/Catalog/Controller/Adminhtml/Category.php
Please register or sign in to comment