Merge remote-tracking branch 'mainline/develop' into BUGS
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .htaccess 75 additions, 5 deletions.htaccess
- .htaccess.sample 79 additions, 16 deletions.htaccess.sample
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml 1 addition, 1 deletion.../templates/catalog/product/view/type/bundle/options.phtml
- app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php 1 addition, 1 deletion...agento/Catalog/Block/Product/View/Options/Type/Select.php
- app/code/Magento/CatalogRule/Model/Rule.php 52 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php 114 additions, 4 deletionsapp/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php
- app/code/Magento/CatalogRule/composer.json 3 additions, 1 deletionapp/code/Magento/CatalogRule/composer.json
- app/code/Magento/CatalogRule/i18n/de_DE.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/de_DE.csv
- app/code/Magento/CatalogRule/i18n/en_US.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/en_US.csv
- app/code/Magento/CatalogRule/i18n/es_ES.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/es_ES.csv
- app/code/Magento/CatalogRule/i18n/fr_FR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/fr_FR.csv
- app/code/Magento/CatalogRule/i18n/nl_NL.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/nl_NL.csv
- app/code/Magento/CatalogRule/i18n/pt_BR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/pt_BR.csv
- app/code/Magento/CatalogRule/i18n/zh_CN.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/zh_CN.csv
- app/code/Magento/CatalogRule/view/adminhtml/templates/promo/js.phtml 39 additions, 1 deletion...gento/CatalogRule/view/adminhtml/templates/promo/js.phtml
- app/code/Magento/CatalogRuleConfigurable/composer.json 3 additions, 1 deletionapp/code/Magento/CatalogRuleConfigurable/composer.json
- app/code/Magento/CatalogSearch/view/frontend/layout/default.xml 3 additions, 0 deletions...de/Magento/CatalogSearch/view/frontend/layout/default.xml
- app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml 1 addition, 1 deletion...CatalogSearch/view/frontend/templates/advanced/link.phtml
- app/code/Magento/ConfigurableProduct/composer.json 2 additions, 2 deletionsapp/code/Magento/ConfigurableProduct/composer.json
Please register or sign in to comment