Merge branch 'develop' into MAGETWO-31368
Showing
- app/code/Magento/Authorization/Model/Acl/AclRetriever.php 3 additions, 1 deletionapp/code/Magento/Authorization/Model/Acl/AclRetriever.php
- app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php 5 additions, 5 deletions...e/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php
- app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php 5 additions, 5 deletions.../Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
- app/code/Magento/Backend/Controller/Adminhtml/Cache.php 1 addition, 1 deletionapp/code/Magento/Backend/Controller/Adminhtml/Cache.php
- app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php 5 additions, 5 deletions...gento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 1 addition, 1 deletion...ento/Backend/Controller/Adminhtml/System/Account/Save.php
- app/code/Magento/Backend/Model/Auth.php 4 additions, 3 deletionsapp/code/Magento/Backend/Model/Auth.php
- app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php 3 additions, 0 deletionsapp/code/Magento/Backend/Model/View/Layout/GeneratorPool.php
- app/code/Magento/Backend/etc/adminhtml/system.xml 4 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backend/etc/config.xml 5 additions, 0 deletionsapp/code/Magento/Backend/etc/config.xml
- app/code/Magento/Backup/Model/Backup.php 2 additions, 2 deletionsapp/code/Magento/Backup/Model/Backup.php
- app/code/Magento/Bundle/Model/LinkManagement.php 16 additions, 14 deletionsapp/code/Magento/Bundle/Model/LinkManagement.php
- app/code/Magento/Bundle/Model/OptionManagement.php 1 addition, 1 deletionapp/code/Magento/Bundle/Model/OptionManagement.php
- app/code/Magento/Bundle/Model/OptionRepository.php 5 additions, 6 deletionsapp/code/Magento/Bundle/Model/OptionRepository.php
- app/code/Magento/Bundle/Model/Product/Type.php 2 additions, 2 deletionsapp/code/Magento/Bundle/Model/Product/Type.php
- app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php 86 additions, 12 deletionsapp/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml 1 addition, 1 deletion...es/product/composite/fieldset/options/type/checkbox.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml 1 addition, 1 deletion...lates/product/composite/fieldset/options/type/multi.phtml
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml 1 addition, 1 deletion...es/catalog/product/view/type/bundle/option/checkbox.phtml
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml 1 addition, 1 deletion...lates/catalog/product/view/type/bundle/option/multi.phtml
Please register or sign in to comment