Merge remote-tracking branch 'ogresCE/develop' into MAGETWO-22864-system-maintenance-command
Conflicts: app/code/Magento/Indexer/composer.json
Showing
- CHANGELOG.md 58 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/Setup/InstallSchema.php 0 additions, 1 deletionapp/code/Magento/Authorization/Setup/InstallSchema.php
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php 2 additions, 2 deletions...Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php 2 additions, 2 deletions...Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php 1 addition, 1 deletion...agento/Backend/Block/Widget/Grid/Column/Filter/Select.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php 1 addition, 1 deletion.../Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php 1 addition, 1 deletion...Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 3 additions, 0 deletions...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/etc/adminhtml/system.xml 0 additions, 7 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml 1 addition, 1 deletion...nto/Backend/view/adminhtml/templates/dashboard/grid.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml 2 additions, 0 deletions...agento/Backend/view/adminhtml/templates/widget/form.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 4 additions, 4 deletions...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml 5 additions, 5 deletions...tml/templates/widget/form/renderer/fieldset/element.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml 4 additions, 4 deletions...agento/Backend/view/adminhtml/templates/widget/grid.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml 6 additions, 5 deletions...ckend/view/adminhtml/templates/widget/grid/extended.phtml
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/Model/Product/Price.php 12 additions, 1 deletionapp/code/Magento/Bundle/Model/Product/Price.php
Please register or sign in to comment