Merge remote-tracking branch 'mainline/2.2-develop' into schmengler-expect-exception-2.2
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .htaccess 128 additions, 38 deletions.htaccess
- .htaccess.sample 129 additions, 38 deletions.htaccess.sample
- .travis.yml 2 additions, 6 deletions.travis.yml
- .user.ini 1 addition, 1 deletion.user.ini
- CHANGELOG.md 690 additions, 0 deletionsCHANGELOG.md
- README.md 4 additions, 2 deletionsREADME.md
- app/.htaccess 8 additions, 2 deletionsapp/.htaccess
- app/bootstrap.php 7 additions, 2 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/composer.json 3 additions, 3 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml 4 additions, 4 deletions...on/view/adminhtml/layout/adminhtml_notification_block.xml
- app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php 157 additions, 102 deletions...ancedPricingImportExport/Model/Export/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 1 addition, 1 deletion...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php 1 addition, 1 deletion...it/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
- app/code/Magento/AdvancedPricingImportExport/composer.json 5 additions, 5 deletionsapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Analytics/Api/Data/LinkInterface.php 24 additions, 0 deletionsapp/code/Magento/Analytics/Api/Data/LinkInterface.php
- app/code/Magento/Analytics/Api/LinkProviderInterface.php 17 additions, 0 deletionsapp/code/Magento/Analytics/Api/LinkProviderInterface.php
- app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php 37 additions, 0 deletions...ytics/Block/Adminhtml/System/Config/AdditionalComment.php
- app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php 29 additions, 0 deletions...ics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
- app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php 64 additions, 0 deletions...Block/Adminhtml/System/Config/SubscriptionStatusLabel.php
Please register or sign in to comment