Merge remote-tracking branch 'upstream/develop' into MAGETWO-36838-filter
Showing
- .htaccess 1 addition, 8 deletions.htaccess
- CHANGELOG.md 39 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/Block/Window.php 1 addition, 1 deletionapp/code/Magento/AdminNotification/Block/Window.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php 1 addition, 21 deletions...o/AdminNotification/Controller/Adminhtml/Notification.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php 8 additions, 0 deletions...fication/Controller/Adminhtml/Notification/MarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php 8 additions, 0 deletions...tion/Controller/Adminhtml/Notification/MassMarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php 8 additions, 0 deletions...fication/Controller/Adminhtml/Notification/MassRemove.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php 8 additions, 0 deletions...Notification/Controller/Adminhtml/Notification/Remove.php
- app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php 1 addition, 1 deletion...agento/AdminNotification/Model/System/Message/Baseurl.php
- app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php 1 addition, 2 deletions...tion/Model/System/Message/Media/Synchronization/Error.php
- app/code/Magento/AdminNotification/Model/System/Message/Security.php 2 additions, 2 deletions...gento/AdminNotification/Model/System/Message/Security.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php 1 addition, 1 deletion.../Model/System/Message/Media/Synchronization/ErrorTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php 1 addition, 1 deletion...ification/Test/Unit/Model/System/Message/SecurityTest.php
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 7 additions, 7 deletionsapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/Model/Acl/AclRetriever.php 5 additions, 2 deletionsapp/code/Magento/Authorization/Model/Acl/AclRetriever.php
- app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php 1 addition, 1 deletion...to/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/Block/Cache.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Cache.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 1 addition, 1 deletion...ento/Backend/Controller/Adminhtml/System/Account/Save.php
Please register or sign in to comment