Skip to content

[Backport] 19404 fixed newsletter issue #7

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
Merged
merged 382 commits into from
Dec 8, 2018
Merged

[Backport] 19404 fixed newsletter issue #7

merged 382 commits into from
Dec 8, 2018

Conversation

saphaljha
Copy link
Owner

Original Pull Request

magento#19416

Description (*)

Fixed Issues (if relevant)

  1. When subscribing to newsletter, if email already exists, don't throw exception, but just warn without exception magento/magento2#19404: When subscribing to newsletter, if email already exists, don't throw exception, but just warn without exception

Manual testing scenarios (*)

  1. Subscribe for the news latter with already register emial

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)

mduuude and others added 30 commits October 26, 2018 12:46
Merge branch '2.2.7-develop' into MAGETWO-61322
c06fc1c
@suryakant-krish
Fixed issue : Left Side Back End Menu Design fix magento#18687
9fbf41a
fixed - can't import external http to https redirecting images by def…
3a88a38 
…ault csv import
@dmytro-ch
Fix the issue with missing asterisk for admin required fields magento…
38bfe66 
…#18904
@zakdma
MAGETWO-95963: [TSG] Pull Request 53 stabilization
299c359
@suryakant-krish
Fixed magento#18918 Asterisk sign display twice
fd9a423
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-95963' into 2.2.7-develo…
2951789 
…p-pr53
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-95647' into 2.2.7-develo…
56449e1 
…p-pr53
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-95709' into 2.2.7-develo…
f42ceda 
…p-pr53
@ameysar
Merge remote-tracking branch 'origin/MAGETWO-95638' into 2.2.7-develo…
e3f8144 
…p-pr53

# Conflicts:
#	app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@magento-engcom-team
ENGCOM-3324: Fixed 18918 Asterisk sign display twice magento#18922
3f30b31 
 - Merge Pull Request magento#18922 from suryakant-krish/magento2:Fixed-18918
 - Merged commits:
   1. 9fbf41a
   2. fd9a423
@dvoskoboinikov
Merge pull request magento#3375 from magento-qwerty/2.2.7-bugfixes-25…
bdff263 
…1018

Fixed issues:
- MAGETWO-92172: [Backport for 2.2.x] Redundant File Names for Quote Attachments
- MAGETWO-92725: Incorrect group actions behavior
- MAGETWO-92181: Fixed incorrect behavior of attribute sets
- MAGETWO-92184: JS Templates Limitations
@zakdma
MAGETWO-95963: [TSG] Pull Request 53 stabilization
b5abfa7
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-95963' into 2.2.7-develo…
a7fb733 
…p-pr53
merge magento/2.2.7-develop into magento-qwerty/MAGETWO-61322
7c2a6c1
@zakdma
Merge remote-tracking branch 'origin/2.2.7-develop' into 2.2.7-develo…
50a35a1 
…p-pr53
@StasKozar
MAGETWO-95964: Unable to create admin order with PayPal Payflow Pro V…
0477bf3 
…ault
@StasKozar
Merge remote-tracking branch 'origin/2.2.7-develop' into MAGETWO-95964
6aa67db
Merge pull request magento#3391 from magento-tsg/2.2.7-develop-pr53
bbf907c 
[TSG] Backporting for 2.2 (pr53) (2.2.7)
@StasKozar
Merge remote-tracking branch 'origin/2.2.7-develop' into MAGETWO-95964
65f99e9
MAGETWO-61322: Fixed incorrect return-order flow
7c674ef
merge magento/2.2.7-develop into magento-qwerty/MAGETWO-61322
b067091
@dvoskoboinikov
Merge pull request magento#3388 from magento-qwerty/MAGETWO-61322
6c4e979 
Fixed issues:
- MAGETWO-61322: Fixed incorrect return-order flow
@zakdma
Merge remote-tracking branch 'origin/MAGETWO-95964' into 2.2.7-develo…
d114f3b 
…p-pr55
Merge pull request magento#3397 from magento-tsg/2.2.7-develop-pr55
67c3162 
[TSG] Backporting for 2.2 (pr55) (2.2.7)
@dmytro-ch
Fix the functional tests failures magento#18904
7d2dd65
@dmytro-ch
Merge branch '2.2-develop' into fix/2.2-issue-18904-missing-asterisk-…
4f07c61 
…for-admin-required-fields
@omiroshnichenko
magento#17813 - Huge "product_data_storage" in localStorage hangs the…
57a85b8 
… shop
@vpodorozh
magento#17833: Child theme does not inherit translations from parent …
caa2fe8 
…theme

(cherry picked from commit 388fb45)
@vpodorozh
magento#17833:  Child theme does not inherit translations from parent…
24330d6 
… theme

- fix code style
sivaschenko and others added 27 commits November 29, 2018 20:02
@sivaschenko
ENGCOM-3587: [Backport] chore: remove unused code in admin view of ca…
d821363 
…talog magento#19447
@sivaschenko
ENGCOM-3584: Sample Link Issue in Downloadable product in magento-2.2.6
ad04a2f 
magento#19344 magento#19431
@sivaschenko
ENGCOM-3583: Fixed issue with Base Currency for website is CND when P…
d6b5325 
…ayPal Payflow Pro is charging in USD magento#19430
@sivaschenko
ENGCOM-3479: [Backport] Allow to read HTTP/2 response header. magento…
c36df15 
…#19239
@sivaschenko
ENGCOM-3324: Fixed 18918 Asterisk sign display twice magento#18922
011e31f
@magento-engcom-team
ENGCOM-3324: Fixed 18918 Asterisk sign display twice magento#18922
4f3d55e 
 - Merge Pull Request magento#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 magento#3492 from magento-tsg/2.2-develop-pr59
3dd49b7 
[TSG] Backporting for 2.2 (pr59) (2.2.8)
@sivaschenko
magento#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
magento#18922: Fixed code styles
c1e2f86
@viktym
Merge pull request magento#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:
 - magento#19447: [Backport] chore: remove unused code in admin view of catalog (by @DanielRuf)
 - magento#19431: [Backport] Sample Link Issue in Downloadable product in magento-2.2.6  magento#19344 (by @ansari-krish)
 - magento#19430: Fixed issue with Base Currency for website is CND when PayPal Payflow Pro is charging in USD (by @Rykh)
 - magento#19239: [Backport] Allow to read HTTP/2 response header. (by @gelanivishal)
 - magento#18922: Fixed 18918 Asterisk sign display twice (by @suryakant-krish)


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

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

 - magento#18918: Asterisk sign display twice (reported by @suryakant-krish) has been fixed in magento#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 magento#3502 from magento-plankton/2.2-develop-mer…
8c6000f 
…ge-2.2.7

[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 magento#3509 from magento-tsg/2.2-develop-pr60
b4269c2 
[TSG] Backporting for 2.2 (pr60) (2.2.8)
@Dharmeshvaja91 @saphaljha
19404-Fixed-News-latter-issue
0d1a1b2
@Dharmeshvaja91 @saphaljha
19404-Fixed-News-latter-issue
e99069c
@saphaljha saphaljha merged commit f7407a4 into 2.2-develop Dec 8, 2018
saphaljha pushed a commit that referenced this pull request Jan 20, 2019
@ravi-chandra3197
Merge pull request #7 from magento/2.3-develop
a06ae36 
update branch 2.3 develop
@saphaljha saphaljha deleted the 2.2-develop-PR-port-19416 branch January 24, 2019 18:39
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.