Merge branch 'mainline' into MAGETWO-44464
Showing
- app/code/Magento/Backend/Block/Widget/Form.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Widget/Form.php
- app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php 120 additions, 122 deletions...est/Unit/Controller/Adminhtml/System/Account/SaveTest.php
- app/code/Magento/Backend/i18n/en_US.csv 6 additions, 0 deletionsapp/code/Magento/Backend/i18n/en_US.csv
- app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php 39 additions, 0 deletions.../Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php
- app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php 42 additions, 0 deletions...nto/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php
- app/code/Magento/Catalog/Model/ProductWebsiteLink.php 51 additions, 0 deletionsapp/code/Magento/Catalog/Model/ProductWebsiteLink.php
- app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php 84 additions, 0 deletions...de/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
- app/code/Magento/Catalog/etc/di.xml 2 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/webapi.xml 20 additions, 0 deletionsapp/code/Magento/Catalog/etc/webapi.xml
- app/code/Magento/Catalog/i18n/en_US.csv 21 additions, 0 deletionsapp/code/Magento/Catalog/i18n/en_US.csv
- app/code/Magento/CatalogRule/Model/Rule.php 4 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php 4 additions, 2 deletions...ento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
- app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php 1 addition, 1 deletion...gento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
- app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php 52 additions, 6 deletions...Rewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
- app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php 1 addition, 1 deletion...rlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
- app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php 33 additions, 4 deletions...Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
- app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php 6 additions, 6 deletions...lRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
- app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php 19 additions, 22 deletions...rlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
- app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php 114 additions, 20 deletions...nit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
- app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 6 additions, 27 deletions...figurableProduct/Block/Product/View/Type/Configurable.php
Please register or sign in to comment