Merge branch 'develop' into...
Merge branch 'develop' into FearlessKiwis-MAGETWO-39281-Rename-hidden_tax-to-discount_tax_compensation-in-performance-toolkit
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/LICENSE.txt 48 additions, 0 deletionsapp/code/Magento/AdvancedPricingImportExport/LICENSE.txt
- app/code/Magento/AdvancedPricingImportExport/LICENSE_AFL.txt 48 additions, 0 deletionsapp/code/Magento/AdvancedPricingImportExport/LICENSE_AFL.txt
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 402 additions, 0 deletions...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php 56 additions, 0 deletions...ngImportExport/Model/Import/AdvancedPricing/Validator.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/GroupPrice.php 127 additions, 0 deletions...ort/Model/Import/AdvancedPricing/Validator/GroupPrice.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php 122 additions, 0 deletions...port/Model/Import/AdvancedPricing/Validator/TierPrice.php
Please register or sign in to comment