MAGETWO-55393: [Github #5636] Many storeviews break the page
- Merge remote-tracking branch 'origin' into MAGETWO-55393 - Conflicts: - app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml - app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
Showing
- .htaccess 0 additions, 30 deletions.htaccess
- .htaccess.sample 0 additions, 30 deletions.htaccess.sample
- .php_cs 0 additions, 1 deletion.php_cs
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php 2 additions, 2 deletions...tion/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php 1 addition, 1 deletion...fication/Controller/Adminhtml/Notification/MarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php 1 addition, 1 deletion...tion/Controller/Adminhtml/Notification/MassMarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php 1 addition, 1 deletion...fication/Controller/Adminhtml/Notification/MassRemove.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php 1 addition, 1 deletion...Notification/Controller/Adminhtml/Notification/Remove.php
- app/code/Magento/AdminNotification/Model/Inbox.php 1 addition, 1 deletionapp/code/Magento/AdminNotification/Model/Inbox.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php 4 additions, 1 deletion...dminNotification/Model/ResourceModel/Inbox/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php 4 additions, 1 deletion...ication/Model/ResourceModel/Inbox/Collection/Critical.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php 2 additions, 2 deletions...ication/Model/ResourceModel/System/Message/Collection.php
- app/code/Magento/AdminNotification/Model/System/Message.php 1 addition, 1 deletionapp/code/Magento/AdminNotification/Model/System/Message.php
- app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php 6 additions, 4 deletions...to/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php 23 additions, 11 deletions...de/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php 2 additions, 2 deletions...nNotification/Test/Unit/Model/NotificationServiceTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php 7 additions, 7 deletions...tion/Test/Unit/Model/System/Message/CacheOutdatedTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php 4 additions, 4 deletions.../Model/System/Message/Media/Synchronization/ErrorTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php 5 additions, 5 deletions...ification/Test/Unit/Model/System/Message/SecurityTest.php
- app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php 1 addition, 1 deletion...ingImportExport/Controller/Adminhtml/Export/GetFilter.php
Please register or sign in to comment