Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into develop
Conflicts: app/code/Magento/Checkout/Service/V1/Cart/ReadService.php app/code/Magento/Checkout/Service/V1/Cart/WriteService.php app/code/Magento/Checkout/Service/V1/Data/Cart.php app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php app/code/Magento/Checkout/Service/V1/Data/CartMapper.php app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php app/code/Magento/Quote/Model/ShippingMethodManagement.php dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php dev/tests/unit/testsuite/Magento/Quote/Model/CouponManagementTest.php dev/tests/unit/testsuite/Magento/Quote/Model/QuoteAddressValidatorTest.php dev/tests/unit/testsuite/Magento/Quote/Model/ShippingAddressManagementTest.php
Showing
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 3 additions, 0 deletions...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 3 additions, 0 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/Model/Observer.php 1 addition, 0 deletionsapp/code/Magento/AdminNotification/Model/Observer.php
- app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php 2 additions, 0 deletions...ento/AdminNotification/Model/Resource/Grid/Collection.php
- app/code/Magento/AdminNotification/Model/Resource/Inbox.php 2 additions, 0 deletionsapp/code/Magento/AdminNotification/Model/Resource/Inbox.php
- app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php 3 additions, 0 deletions...agento/AdminNotification/Model/System/Message/Baseurl.php
- app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php 3 additions, 0 deletions...tion/Model/System/Message/Media/Synchronization/Error.php
- app/code/Magento/AdminNotification/Model/System/Message/Security.php 3 additions, 0 deletions...gento/AdminNotification/Model/System/Message/Security.php
- app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 3 additions, 0 deletions...cation/view/adminhtml/templates/notification/window.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 3 additions, 0 deletions...tification/view/adminhtml/templates/system/messages.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 3 additions, 0 deletions...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml 3 additions, 0 deletions...Notification/view/adminhtml/templates/toolbar_entry.phtml
- app/code/Magento/Authorization/Model/Acl/AclRetriever.php 1 addition, 0 deletionsapp/code/Magento/Authorization/Model/Acl/AclRetriever.php
- app/code/Magento/Authorization/Model/Resource/Rules.php 3 additions, 0 deletionsapp/code/Magento/Authorization/Model/Resource/Rules.php
- app/code/Magento/Backend/App/Action.php 3 additions, 0 deletionsapp/code/Magento/Backend/App/Action.php
- app/code/Magento/Backend/App/Action/Context.php 3 additions, 0 deletionsapp/code/Magento/Backend/App/Action/Context.php
- app/code/Magento/Backend/App/Config.php 3 additions, 0 deletionsapp/code/Magento/Backend/App/Config.php
- app/code/Magento/Backend/App/DefaultPath.php 1 addition, 0 deletionsapp/code/Magento/Backend/App/DefaultPath.php
- app/code/Magento/Backend/Block/Dashboard.php 3 additions, 0 deletionsapp/code/Magento/Backend/Block/Dashboard.php
- app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php 3 additions, 0 deletions...ode/Magento/Backend/Block/Dashboard/AbstractDashboard.php
Please register or sign in to comment