Merge pull request #192 from magento-firedrakes/bugfixes (31a28e8d) · Commits · KIII-12 / Magento

Commit 31a28e8d authored 9 years ago by

Logvin, Michael(mlogvin)

Merge pull request #192 from magento-firedrakes/bugfixes

[Firedrakes && South && WebDev] Bugfixes

parents f3bf4cb3 30aacd9f

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/i18n/en_US.csv 1 addition, 1 deletion

app/code/Magento/Backend/i18n/en_US.csv
app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml 1 addition, 1 deletion

...nto/Backend/view/adminhtml/templates/page/copyright.phtml
app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php 2 additions, 2 deletions

...de/Magento/Customer/Model/ResourceModel/Customer/Grid.php
app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php 1 addition, 1 deletion

...o/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php 1 addition, 1 deletion

...tomer/Test/Unit/Model/ResourceModel/Customer/GridTest.php
app/code/Magento/Sales/etc/fieldset.xml 0 additions, 1 deletion

app/code/Magento/Sales/etc/fieldset.xml
app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js 16 additions, 5 deletions

.../Magento/Sales/view/adminhtml/web/order/create/scripts.js
app/code/Magento/Ui/Setup/InstallSchema.php 1 addition, 1 deletion

app/code/Magento/Ui/Setup/InstallSchema.php
app/code/Magento/Ui/composer.json 2 additions, 1 deletion

app/code/Magento/Ui/composer.json
app/design/frontend/Magento/blank/web/images/logo.svg 1 addition, 1 deletion

app/design/frontend/Magento/blank/web/images/logo.svg
dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php 2 additions, 2 deletions

...tsuite/Magento/Quote/Api/BillingAddressManagementTest.php
dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php 1 addition, 1 deletion

...e/Magento/Quote/Api/GuestBillingAddressManagementTest.php
dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml 1 addition, 1 deletion

...sts/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml
dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php 2 additions, 2 deletions

...ion/testsuite/Magento/Customer/Controller/AddressTest.php
dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php 1 addition, 1 deletion

...suite/Magento/Customer/Model/Metadata/FormFactoryTest.php
dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php 36 additions, 0 deletions

...ation/testsuite/Magento/Sales/Model/Convert/OrderTest.php
lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php 3 additions, 3 deletions

...ework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
lib/web/images/logo.svg 1 addition, 1 deletion

lib/web/images/logo.svg
lib/web/images/magento-logo.svg 1 addition, 18 deletions

lib/web/images/magento-logo.svg
package.json 1 addition, 1 deletion

package.json

with 75 additions and 45 deletions

Please register or to comment

Admin message

Merge pull request #192 from magento-firedrakes/bugfixes