Merge remote-tracking branch 'upstream/develop' into MAGETWO-41913-content-headers
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .htaccess 75 additions, 5 deletions.htaccess
- .htaccess.sample 79 additions, 16 deletions.htaccess.sample
- app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php 3 additions, 37 deletions...ancedPricingImportExport/Model/Export/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 15 additions, 49 deletions...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/GroupPrice.php 0 additions, 160 deletions...ort/Model/Import/AdvancedPricing/Validator/GroupPrice.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php 13 additions, 0 deletions...port/Model/Import/AdvancedPricing/Validator/TierPrice.php
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php 0 additions, 3 deletions...Export/Model/Import/AdvancedPricing/Validator/Website.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php 0 additions, 6 deletions...portExport/Test/Unit/Model/Export/AdvancedPricingTest.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/GroupPriceTest.php 0 additions, 334 deletions...Model/Import/AdvancedPricing/Validator/GroupPriceTest.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php 0 additions, 46 deletions.../Model/Import/AdvancedPricing/Validator/TierPriceTest.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php 0 additions, 44 deletions...it/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php 10 additions, 70 deletions...portExport/Test/Unit/Model/Import/AdvancedPricingTest.php
- app/code/Magento/AdvancedPricingImportExport/etc/di.xml 0 additions, 1 deletionapp/code/Magento/AdvancedPricingImportExport/etc/di.xml
- app/code/Magento/Authorizenet/Model/Authorizenet.php 61 additions, 17 deletionsapp/code/Magento/Authorizenet/Model/Authorizenet.php
- app/code/Magento/Authorizenet/Model/Directpost.php 37 additions, 26 deletionsapp/code/Magento/Authorizenet/Model/Directpost.php
- app/code/Magento/Authorizenet/etc/adminhtml/system.xml 1 addition, 1 deletionapp/code/Magento/Authorizenet/etc/adminhtml/system.xml
- app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js 1 addition, 1 deletion...s/view/payment/method-renderer/authorizenet-directpost.js
- app/code/Magento/Backend/Block/Store/Switcher.php 2 additions, 2 deletionsapp/code/Magento/Backend/Block/Store/Switcher.php
- app/code/Magento/Backend/Block/Widget/Grid.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Widget/Grid.php
Please register or sign in to comment