Merge branches 'develop' and 'pr-develop' of... (4bc615fe) · Commits · KIII-12 / Magento

Commit 4bc615fe authored 8 years ago by

Karpenko, Oleksandr

Merge branches 'develop' and 'pr-develop' of...

Merge branches 'develop' and 'pr-develop' of https://github.com/magento-frontend/magento2ce into pr-develop

parents 630e3389 ea0272d0

Branches

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php 28 additions, 1 deletion

...ancedPricingImportExport/Model/Export/AdvancedPricing.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 18 additions, 4 deletions

...ancedPricingImportExport/Model/Import/AdvancedPricing.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php 3 additions, 1 deletion

...port/Model/Import/AdvancedPricing/Validator/TierPrice.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php 48 additions, 0 deletions

.../Model/Import/AdvancedPricing/Validator/TierPriceType.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php 78 additions, 0 deletions

...el/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php 126 additions, 24 deletions

...portExport/Test/Unit/Model/Import/AdvancedPricingTest.php
app/code/Magento/AdvancedPricingImportExport/etc/di.xml 1 addition, 0 deletions

app/code/Magento/AdvancedPricingImportExport/etc/di.xml
app/code/Magento/Authorizenet/Model/Authorizenet.php 2 additions, 2 deletions

app/code/Magento/Authorizenet/Model/Authorizenet.php
app/code/Magento/Authorizenet/Model/Directpost/Request.php 2 additions, 2 deletions

app/code/Magento/Authorizenet/Model/Directpost/Request.php
app/code/Magento/Backend/App/Config.php 31 additions, 22 deletions

app/code/Magento/Backend/App/Config.php
app/code/Magento/Backend/App/ConfigInterface.php 5 additions, 0 deletions

app/code/Magento/Backend/App/ConfigInterface.php
app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php 46 additions, 24 deletions

...agento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
app/code/Magento/Backend/Model/Session/Quote.php 0 additions, 7 deletions

app/code/Magento/Backend/Model/Session/Quote.php
app/code/Magento/Backend/Model/Url.php 10 additions, 3 deletions

app/code/Magento/Backend/Model/Url.php
app/code/Magento/Backend/Test/Unit/App/ConfigTest.php 31 additions, 63 deletions

app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php 6 additions, 31 deletions

...ode/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
app/code/Magento/Backend/Test/Unit/Model/UrlTest.php 19 additions, 44 deletions

app/code/Magento/Backend/Test/Unit/Model/UrlTest.php
app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml 2 additions, 0 deletions

...o/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
app/code/Magento/Braintree/view/adminhtml/web/js/vault.js 1 addition, 1 deletion

app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js 1 addition, 1 deletion

...ew/frontend/web/js/view/payment/method-renderer/paypal.js

with 458 additions and 230 deletions

Please register or to comment

Admin message

Merge branches 'develop' and 'pr-develop' of...