Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into Troll_S32
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
Showing
- app/bootstrap.php 1 addition, 1 deletionapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 11 additions, 6 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/Backend/App/AbstractAction.php 1 addition, 1 deletionapp/code/Magento/Backend/App/AbstractAction.php
- app/code/Magento/Backend/Block/Dashboard/Graph.php 18 additions, 28 deletionsapp/code/Magento/Backend/Block/Dashboard/Graph.php
- app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php 1 addition, 3 deletionsapp/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
- app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php 1 addition, 3 deletionsapp/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
- app/code/Magento/Backend/Block/Menu.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/Page.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Page.php
- app/code/Magento/Backend/Block/Page/Locale.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Page/Locale.php
- app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php 1 addition, 1 deletion.../Magento/Backend/Block/System/Design/Edit/Tab/General.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php 28 additions, 41 deletions.../Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 22 additions, 36 deletions...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php 2 additions, 25 deletions...agento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php 6 additions, 47 deletions...to/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
- app/code/Magento/Backend/Helper/Data.php 1 addition, 1 deletionapp/code/Magento/Backend/Helper/Data.php
- app/code/Magento/Backend/Model/Locale/Resolver.php 3 additions, 9 deletionsapp/code/Magento/Backend/Model/Locale/Resolver.php
- app/code/Magento/Backend/Model/Observer.php 0 additions, 28 deletionsapp/code/Magento/Backend/Model/Observer.php
- app/code/Magento/Backup/Model/Backup.php 1 addition, 4 deletionsapp/code/Magento/Backup/Model/Backup.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php 1 addition, 1 deletion...g/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
- app/code/Magento/Catalog/Block/Product/NewProduct.php 2 additions, 11 deletionsapp/code/Magento/Catalog/Block/Product/NewProduct.php
Please register or sign in to comment