Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-26655-TD (4f294ebf) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 4f294ebf authored 10 years ago by

Ievgen Shakhsuvarov

Browse files

Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-26655-TD

parents a6825fa0 7581dd6b

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Checkout/Model/Type/Onepage.php 2 additions, 2 deletions

app/code/Magento/Checkout/Model/Type/Onepage.php
app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php 5 additions, 1 deletion

app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php
app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php 5 additions, 1 deletion

...ode/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php
app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php 5 additions, 1 deletion

.../Magento/Customer/Controller/Adminhtml/Index/Validate.php
app/code/Magento/Customer/Model/AccountManagement.php 1 addition, 1 deletion

app/code/Magento/Customer/Model/AccountManagement.php
app/code/Magento/Customer/Model/Address/Mapper.php 1 addition, 1 deletion

app/code/Magento/Customer/Model/Address/Mapper.php
app/code/Magento/Customer/Model/Customer/Mapper.php 1 addition, 1 deletion

app/code/Magento/Customer/Model/Customer/Mapper.php
app/code/Magento/Customer/Model/Resource/CustomerRepository.php 3 additions, 1 deletion

...de/Magento/Customer/Model/Resource/CustomerRepository.php
app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php 1 addition, 1 deletion

.../Customer/Model/Resource/Group/Grid/ServiceCollection.php
app/code/Magento/Integration/Model/Oauth/Consumer.php 17 additions, 0 deletions

app/code/Magento/Integration/Model/Oauth/Consumer.php
app/code/Magento/Integration/Model/Oauth/Token/Provider.php 2 additions, 20 deletions

app/code/Magento/Integration/Model/Oauth/Token/Provider.php
app/code/Magento/Integration/Model/Resource/Oauth/Consumer.php 18 additions, 0 deletions

...ode/Magento/Integration/Model/Resource/Oauth/Consumer.php
app/code/Magento/Integration/etc/adminhtml/system.xml 1 addition, 1 deletion

app/code/Magento/Integration/etc/adminhtml/system.xml
app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php 1 addition, 1 deletion

...gento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
app/code/Magento/Sales/Model/Quote.php 3 additions, 1 deletion

app/code/Magento/Sales/Model/Quote.php
dev/tests/api-functional/testsuite/Magento/Webapi/Authentication/RestTest.php 1 addition, 1 deletion

...onal/testsuite/Magento/Webapi/Authentication/RestTest.php
dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php 2 additions, 1 deletion

...suite/Magento/Customer/Controller/Adminhtml/GroupTest.php
dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php 14 additions, 3 deletions

...estsuite/Magento/Customer/Model/AccountManagementTest.php
dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php 6 additions, 2 deletions

...testsuite/Magento/Customer/Model/CustomerMetadataTest.php
dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php 10 additions, 2 deletions

...agento/Customer/Model/Resource/CustomerRepositoryTest.php

with 99 additions and 42 deletions

Please register or to comment

Admin message

Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-26655-TD