Skip to content

Commit 8913695

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch 'develop' of github.com:magento-folks/magento2ce into MAGETWO-56849
# Conflicts: # app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js # app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/authorizenet.js # app/code/Magento/Backend/view/adminhtml/web/js/bootstrap/editor.js # app/code/Magento/Checkout/view/frontend/web/js/action/create-shipping-address.js # app/code/Magento/Checkout/view/frontend/web/js/action/get-totals.js # app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-registry.js # app/code/Magento/Checkout/view/frontend/web/js/region-updater.js # app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js # app/code/Magento/Cookie/view/adminhtml/requirejs-config.js # app/code/Magento/Customer/view/adminhtml/requirejs-config.js # app/code/Magento/Customer/view/frontend/web/js/model/address-list.js # app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js # app/code/Magento/Integration/view/adminhtml/requirejs-config.js # app/code/Magento/Multishipping/view/frontend/web/js/multi-shipping.js # app/code/Magento/OfflinePayments/view/frontend/web/js/view/payment/offline-payments.js # app/code/Magento/PageCache/view/frontend/web/js/page-cache.js # app/code/Magento/Payment/view/frontend/web/js/view/payment/payments.js # app/code/Magento/Sales/view/adminhtml/web/js/bootstrap/order-create-index.js # app/code/Magento/Sales/view/adminhtml/web/order/edit/message.js # app/code/Magento/Sales/view/adminhtml/web/order/giftoptions_tooltip.js # app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js # app/code/Magento/Theme/view/adminhtml/web/js/form.js # app/code/Magento/Theme/view/frontend/web/js/truncate.js # app/code/Magento/Theme/view/frontend/web/menu.js # app/code/Magento/Variable/view/adminhtml/web/variables.js # dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/sticky/sticky.test.js # dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js # lib/web/mage/adminhtml/backup.js # lib/web/mage/adminhtml/events.js # lib/web/mage/adminhtml/grid.js
2 parents 6754864 + e3c955c commit 8913695

File tree

24,134 files changed

+81703
-29613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

24,134 files changed

+81703
-29613
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ atlassian*
5151
!/var/.htaccess
5252
/vendor/*
5353
!/vendor/.htaccess
54+
/generated/*
55+
!/generated/.htaccess

‎.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ matrix:
3131
before_install: ./dev/travis/before_install.sh
3232
install: composer install --no-interaction --prefer-dist
3333
before_script: ./dev/travis/before_script.sh
34-
script:
34+
script:
3535
- cd dev/tests/$TEST_SUITE
3636
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
3737
- phpunit $TEST_FILTER

‎Gruntfile.js.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2016 Magento. All rights reserved.
2+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

‎app/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
use Magento\Framework\Autoload\AutoloaderRegistry;

‎app/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification inbox grid
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block;

0 commit comments

Comments
 (0)