Merge remote-tracking branch 'mainline/develop' into MAGETWO-52914-setup-ui-modifications (24aaeb16) · Commits · KIII-12 / Magento

Commit 24aaeb16 authored 9 years ago by

Ivan Gavryshko

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-52914-setup-ui-modifications

parents 1664c512 61442656

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js 4 additions, 7 deletions

...tend/web/js/view/payment/method-renderer/hosted-fields.js
app/code/Magento/CatalogImportExport/Model/Export/Product.php 2 additions, 1 deletion

...code/Magento/CatalogImportExport/Model/Export/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product.php 1 addition, 1 deletion

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js 12 additions, 3 deletions

...eements/view/frontend/web/js/model/agreement-validator.js
app/code/Magento/Eav/Model/Entity/AbstractEntity.php 2 additions, 2 deletions

app/code/Magento/Eav/Model/Entity/AbstractEntity.php
app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php 1 addition, 1 deletion

...nto/ImportExport/Controller/Adminhtml/Import/Validate.php
app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php 2 additions, 2 deletions

...agento/ImportExport/Controller/Adminhtml/ImportResult.php
app/code/Magento/ImportExport/Model/Import.php 2 additions, 2 deletions

app/code/Magento/ImportExport/Model/Import.php
app/code/Magento/ImportExport/i18n/en_US.csv 6 additions, 6 deletions

app/code/Magento/ImportExport/i18n/en_US.csv
app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php 2 additions, 1 deletion

.../Quote/ShippingAssignment/ShippingAssignmentProcessor.php
app/code/Magento/Quote/Model/QuoteRepository.php 0 additions, 1 deletion

app/code/Magento/Quote/Model/QuoteRepository.php
app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingAssignmentProcessorTest.php 111 additions, 0 deletions

...te/ShippingAssignment/ShippingAssignmentProcessorTest.php
app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php 96 additions, 20 deletions

...ode/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
app/code/Magento/Sales/Block/Order/Totals.php 1 addition, 1 deletion

app/code/Magento/Sales/Block/Order/Totals.php
app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php 1 addition, 0 deletions

app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
app/code/Magento/Sales/Model/AdminOrder/Create.php 3 additions, 2 deletions

app/code/Magento/Sales/Model/AdminOrder/Create.php
app/code/Magento/Sales/Model/Order/Shipment.php 16 additions, 7 deletions

app/code/Magento/Sales/Model/Order/Shipment.php
app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php 123 additions, 4 deletions

...code/Magento/Sales/Test/Unit/Model/Order/ShipmentTest.php
app/code/Magento/Theme/Controller/Result/MessagePlugin.php 129 additions, 0 deletions

app/code/Magento/Theme/Controller/Result/MessagePlugin.php
app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php 415 additions, 0 deletions

...o/Theme/Test/Unit/Controller/Result/MessagePluginTest.php

with 929 additions and 61 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-52914-setup-ui-modifications