Merge remote-tracking branch 'mainline/develop' into MAGETWO-35465
Showing
- Gruntfile.js 0 additions, 8 deletionsGruntfile.js
- app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 1 addition, 1 deletion...cation/view/adminhtml/templates/notification/window.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 1 addition, 1 deletion...tification/view/adminhtml/templates/system/messages.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 1 addition, 1 deletion...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 6 additions, 8 deletions...minNotification/view/adminhtml/web/system/notification.js
- app/code/Magento/Backend/Block/Menu.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php 0 additions, 2 deletions.../Magento/Backend/Block/System/Design/Edit/Tab/General.php
- app/code/Magento/Backend/Block/Widget/Form.php 0 additions, 1 deletionapp/code/Magento/Backend/Block/Widget/Form.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php 0 additions, 4 deletions.../Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 0 additions, 1 deletion...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/Model/Auth.php 2 additions, 0 deletionsapp/code/Magento/Backend/Model/Auth.php
- app/code/Magento/Backend/Model/Auth/Session.php 1 addition, 0 deletionsapp/code/Magento/Backend/Model/Auth/Session.php
- app/code/Magento/Backend/Model/Search/Order.php 1 addition, 6 deletionsapp/code/Magento/Backend/Model/Search/Order.php
- app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php 105 additions, 2 deletions...code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
- app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml 2 additions, 4 deletions...Magento/Backend/view/adminhtml/templates/admin/page.phtml
- 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/page/js/calendar.phtml 2 additions, 1 deletion...o/Backend/view/adminhtml/templates/page/js/calendar.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 7 additions, 3 deletions...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml 45 additions, 18 deletions...agento/Backend/view/adminhtml/templates/widget/tabs.phtml
- app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml 4 additions, 4 deletions...ento/Backup/view/adminhtml/templates/backup/dialogs.phtml
Please register or sign in to comment