MAGETWO-55908: Prepare PR (0e6f7181) · Commits · KIII-12 / Magento

Commit 0e6f7181 authored 8 years ago by

Yaroslav Onischenko

Browse files

MAGETWO-55908: Prepare PR

parents 3ee655a3 8744435b

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Braintree/Gateway/Config/Config.php 10 additions, 0 deletions

app/code/Magento/Braintree/Gateway/Config/Config.php
app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php 1 addition, 1 deletion

.../Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
app/code/Magento/Braintree/Model/Ui/ConfigProvider.php 9 additions, 1 deletion

app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php 1 addition, 2 deletions

...tree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php 25 additions, 2 deletions

...gento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
app/code/Magento/Catalog/i18n/en_US.csv 1 addition, 0 deletions

app/code/Magento/Catalog/i18n/en_US.csv
app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml 6 additions, 3 deletions

...atalog/view/adminhtml/ui_component/design_config_form.xml
app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js 42 additions, 0 deletions

.../Catalog/view/adminhtml/web/component/image-size-field.js
app/code/Magento/CatalogImportExport/Model/Export/Product.php 8 additions, 0 deletions

...code/Magento/CatalogImportExport/Model/Export/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php 23 additions, 0 deletions

...gento/CatalogImportExport/Model/Import/Product/Option.php
app/code/Magento/CatalogInventory/Setup/InstallSchema.php 1 addition, 1 deletion

app/code/Magento/CatalogInventory/Setup/InstallSchema.php
app/code/Magento/CatalogInventory/etc/module.xml 1 addition, 1 deletion

app/code/Magento/CatalogInventory/etc/module.xml
app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 26 additions, 6 deletions

...e/Magento/Checkout/view/frontend/web/js/region-updater.js
app/code/Magento/Dhl/Model/Plugin/Rma/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php 0 additions, 39 deletions

...a/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php
app/code/Magento/Dhl/composer.json 1 addition, 2 deletions

app/code/Magento/Dhl/composer.json
app/code/Magento/Dhl/etc/di.xml 0 additions, 4 deletions

app/code/Magento/Dhl/etc/di.xml
app/code/Magento/Fedex/Model/Carrier.php 221 additions, 101 deletions

app/code/Magento/Fedex/Model/Carrier.php
app/code/Magento/Fedex/Model/Plugin/Rma/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php 0 additions, 39 deletions

...a/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php
app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php 465 additions, 143 deletions

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
app/code/Magento/Fedex/composer.json 0 additions, 3 deletions

app/code/Magento/Fedex/composer.json

with 841 additions and 348 deletions

Please register or to comment

Admin message

MAGETWO-55908: Prepare PR