Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 2.2 develop #3

Merged
merged 1,244 commits into from
Dec 8, 2018
Merged

Update 2.2 develop #3

merged 1,244 commits into from
Dec 8, 2018

Conversation

nirav-kadiya
Copy link
Owner

Description (*)

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title
  2. ...

Manual testing scenarios (*)

  1. ...
  2. ...

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

eduard13 and others added 30 commits November 15, 2018 10:52
@eduard13
Covering the CheckUserLoginBackendObserver by Unit Test
7415cdd
Merge branch 'MAGETWO-73061' into 2.2-develop-pr10
ea434c7
@StasKozar
Merge remote-tracking branch 'origin/MAGETWO-88810' into 2.2-develop-…
0cae940 
…pr58
Merge branch 'MAGETWO-94235' into mpi-fix-94235
2c6d6af
@xmav
MAGETWO-96373: CHANGELOG.md for 2.2.7 Release
6124b77
@droed89
Merge branch 'MAGETWO-96288' of https://github.com/magento-tango/mage…
011f0fd 
…nto2ce into PR_15_11_2018
@droed89
Merge branch 'MAGETWO-96027' of https://github.com/magento-tango/mage…
f56c993 
…nto2ce into PR_15_11_2018
Merge pull request #3453 from magento-plankton/2.2.7-develop
cd5ad1c 
[Plankton] CHANGELOG.md for 2.2.7 Release
@gelanivishal
#18956 Fixes for set root_category_id
aa4abec
@gelanivishal
CodeReviewChange
acefdb3
@gelanivishal
#18956 Fix for phpunit-test case
5866a39
@gelanivishal
#18956 Add TestCase for no root_category_id set
fee2712
@slavvka @gelanivishal
ENGCOM-3408: #18956 Fixes for set root_category_id #18958
7be21e2 
- fixed docblocks
@vovayatsyuk @gelanivishal
Allow to read HTTP/2 response header.
ebe4af7 
The issue is HTTP/2 sends the following headers `HTTP/2 200`, `HTTP/2 401`
and so on. It doesn't have third parameter like HTTP/1.1 has: `HTTP/2 200 OK`
@dmytro-ch @gelanivishal
Add missing unit test for WishlistSettings plugin
64718ce
@magento-engcom-team
ENGCOM-3478: [Backport] Add missing unit test for WishlistSettings pl…
645f4f3 
…ugin #19240

 - Merge Pull Request #19240 from gelanivishal/magento2:2.2-develop-PR-port-18906
 - Merged commits:
   1. 64718ce
@magento-engcom-team
ENGCOM-3479: [Backport] Allow to read HTTP/2 response header. #19239
46c088c 
 - Merge Pull Request #19239 from gelanivishal/magento2:2.2-develop-PR-port-19143
 - Merged commits:
   1. ebe4af7
@magento-engcom-team
ENGCOM-3467: [Backport] Covering the CheckUserLoginBackendObserver by…
f417c40 
… Unit Test #19217

 - Merge Pull Request #19217 from eduard13/magento2:2.2-develop-19175-bp
 - Merged commits:
   1. 7415cdd
@magento-engcom-team
ENGCOM-3468: [Backport] Covering the \Magento\Weee observers by Unit …
c503b97 
…Tests #19216

 - Merge Pull Request #19216 from eduard13/magento2:2.2-develop-19103-bp
 - Merged commits:
   1. a9ac1c4
@viktorpetryk
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73140
bc904a2
@viktorpetryk
Merge remote-tracking branch 'origin/MAGETWO-73140' into 2.2-develop-…
c9d1923 
…pr58
@viktorpetryk
MAGETWO-73922: Import doesn't allow to set default value per store vi…
6ab0dee 
…ew (dropdown fields)
@StasKozar
Merge remote-tracking branch 'origin/MAGETWO-87985' into 2.2-develop-…
cb868c4 
…pr58
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-96074' into 2.2-develop-…
5eb8a99 
…pr58
@magento-team
MAGETWO-95168: Magento 2.2.7 Publication
32e14db 
 (build 2.2.7.019)
@StasKozar
MAGETWO-90381: Bundle product price doubled when switching currency
104c56c
@magento-engcom-team
ENGCOM-3480: [Forwardport] #18956 Fixes for set root_category_id #19237
f1b25b9 
 - Merge Pull Request #19237 from gelanivishal/magento2:2.2-develop-PR-port-18958
 - Merged commits:
   1. aa4abec
   2. acefdb3
   3. 5866a39
   4. fee2712
   5. 7be21e2
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-86120' into 2.2-develop-…
e544c95 
…pr58
@viktym
Merge pull request #3452 from magento-mpi/mpi-fix-94235
da0b4f1 
[MPI]-fix-94235
@dhorytskyi
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
3b6c90b 
…nto PR_15_11_2018
sivaschenko and others added 25 commits November 29, 2018 20:02
@sivaschenko
ENGCOM-3587: [Backport] chore: remove unused code in admin view of ca…
d821363 
…talog #19447
@sivaschenko
ENGCOM-3584: Sample Link Issue in Downloadable product in magento-2.2.6
ad04a2f 
#19344 #19431
@sivaschenko
ENGCOM-3583: Fixed issue with Base Currency for website is CND when P…
d6b5325 
…ayPal Payflow Pro is charging in USD #19430
@sivaschenko
ENGCOM-3479: [Backport] Allow to read HTTP/2 response header. #19239
c36df15
@sivaschenko
ENGCOM-3324: Fixed 18918 Asterisk sign display twice #18922
011e31f
@magento-engcom-team
ENGCOM-3324: Fixed 18918 Asterisk sign display twice #18922
4f3d55e 
 - Merge Pull Request #18922 from suryakant-krish/magento2:Fixed-18918
 - Merged commits:
   1. 9fbf41a
   2. fd9a423
   3. 7365f5f
   4. c870f0d
   5. 1197845
   6. c230c7e
@sivaschenko
Merge branch 'ENGCOM-3324-magento-magento2-18922' of github.com:magen…
5f0c95f 
…to-engcom/magento2ce into HEAD
@OlgaVasyltsun
MAGETWO-90381: Bundle product price doubled when switching currency
c274c00
@OlgaVasyltsun
Merge remote-tracking branch 'origin/MAGETWO-90381' into 2.2-develop-…
398d1f1 
…pr59
@xmav
Merge pull request #3492 from magento-tsg/2.2-develop-pr59
3dd49b7 
[TSG] Backporting for 2.2 (pr59) (2.2.8)
@sivaschenko
#18922: Fixed code styles
65475d9
@magento-engcom-team
[EngCom] Public Pull Requests - 2.2-develop
87fa4c2 
 - merged latest code from mainline branch
Merge branch '2.2-develop' of github.com:magento/magento2ce into fix-…
2af88f1 
…95898
@sivaschenko
#18922: Fixed code styles
c1e2f86
@viktym
Merge pull request #3496 from magento-mpi/fix-95898
302437a 
[MPI]-fix-95898
@magento-engcom-team
[EngCom] Public Pull Requests - 2.2-develop
ad398bf 
 - merged latest code from mainline branch
@magento-engcom-team
🔃 [EngCom] Public Pull Requests - 2.2-develop
a72f59b 
Accepted Public Pull Requests:
 - #19447: [Backport] chore: remove unused code in admin view of catalog (by @DanielRuf)
 - #19431: [Backport] Sample Link Issue in Downloadable product in magento-2.2.6  #19344 (by @ansari-krish)
 - #19430: Fixed issue with Base Currency for website is CND when PayPal Payflow Pro is charging in USD (by @Rykh)
 - #19239: [Backport] Allow to read HTTP/2 response header. (by @gelanivishal)
 - #18922: Fixed 18918 Asterisk sign display twice (by @suryakant-krish)


Fixed GitHub Issues:
 - #19344: Sample Link Issue in Downloadable product. (reported by @ansari-krish) has been fixed in #19431 by @ansari-krish in 2.2-develop branch
   Related commits:
     1. eed8485
     2. 99dbb54
     3. 29eea73
     4. 3b6307b
     5. e519bc6

 - #19127: Cannot connect to Magento 2 market place (reported by @terrybakshi) has been fixed in #19239 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. ebe4af7

 - #18918: Asterisk sign display twice (reported by @suryakant-krish) has been fixed in #18922 by @suryakant-krish in 2.2-develop branch
   Related commits:
     1. 9fbf41a
     2. fd9a423
     3. 7365f5f
     4. c870f0d
     5. 1197845
     6. c230c7e
@OlgaVasyltsun
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-74208
164619a
@OlgaVasyltsun
Merge remote-tracking branch 'origin/MAGETWO-74208' into 2.2-develop-…
2430b3d 
…pr60
@xmav
MAGETWO-95168: Magento 2.2.7 Publication
7b28e74 
 - Merged branch 'publication/2.2' into 'origin/2.2-develop'
@xmav
MAGETWO-95168: Magento 2.2.7 Publication
ba0daa5 
 - Updated composer.lock and composer.json
@xmav
MAGETWO-95168: Magento 2.2.7 Publication
8e455b9 
 - Fix functional tests
@xmav
Merge pull request #3502 from magento-plankton/2.2-develop-merge-2.2.7
8c6000f 
[Plankton] MAGETWO-95168 Magento 2.2.7 Publication
@zakdma
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr60
edd3a2f
Merge pull request #3509 from magento-tsg/2.2-develop-pr60
b4269c2 
[TSG] Backporting for 2.2 (pr60) (2.2.8)
@nirav-kadiya nirav-kadiya merged commit 8a059e6 into nirav-kadiya:2.2-develop Dec 8, 2018
nirav-kadiya pushed a commit that referenced this pull request Dec 8, 2018
@samuel27m
Merge pull request #3 from samuel27m/samuel27m-patch-3
2b2d4e2 
Backport [PR 18772] Remove unnecesary "header" block redeclaration
nirav-kadiya pushed a commit that referenced this pull request Dec 8, 2018
@speedy008
Merge pull request #3 from magento/2.2-develop
7c013a1 
2.2 develop-update branch
nmalevanec pushed a commit that referenced this pull request Dec 11, 2018
@ravi-chandra3197
Merge pull request #3 from magento/2.3-develop
78b694f 
merge request
nmalevanec pushed a commit that referenced this pull request Dec 11, 2018
@khodu
Merge pull request #3 from magento/2.3-develop
dd965b9 
merge latest changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.