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.

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

Email to a Friend feature #9824

Merged
merged 3 commits into from
Jun 12, 2017
Merged

Email to a Friend feature #9824

merged 3 commits into from
Jun 12, 2017

Conversation

WaPoNe
Copy link
Contributor

@WaPoNe WaPoNe commented Jun 1, 2017

To offer the possibility to insert some code (like Google reCaptcha) first of "Send Email" button.

Description

As for other form (ex. "Forgot your Password"), "Email to a Friend" form needs the possibility to add some code first of "Send Email" button, by layout.

@WaPoNe WaPoNe changed the title Wa po ne patch 1 Email to a Friend feature Jun 1, 2017
@okorshenko
Copy link
Contributor

@WaPoNe thank you for your contribution. Could you please resolve the conflict so that we can proceed with PR acceptance. Thank you

@WaPoNe
Copy link
Contributor Author

WaPoNe commented Jun 6, 2017

@okorshenko you can proceed with PR acceptance.

@okorshenko okorshenko added this to the June 2017 milestone Jun 7, 2017
@magento-team magento-team merged commit 719ecf1 into magento:develop Jun 12, 2017
magento-team pushed a commit that referenced this pull request Jun 12, 2017
 - fixed template configuration format
magento-team pushed a commit that referenced this pull request Jun 12, 2017
AntonEvers pushed a commit to AntonEvers/magento2 that referenced this pull request Jun 14, 2017
…-9924

* upstream/develop: (60 commits)
  Fix typo in comment
  Move prefix and suffix default values to a new PR
  MAGETWO-68877: Issue magento#7988 Typo changed also added comments for each index, getters and setters. magento#9484
  Revert "MAGETWO-69728: Fixes layered navigation options being cached using the wrong store id. magento#9873"
  MAGETWO-67500: setup:di:compile returns exit code 0 if errors are found magento#7780
  Fix prefix, middle name and suffix were not prefilled in the checkout
  add middle name to checkout address html templates magento#8878
  Using Command output as message which actually provides more information for debugging than just the path
  Handling CLI error as a failure when validating composer.json file
  MAGETWO-69805: Return array of blocks as items instead of array of arrays magento#9157
  MAGETWO-69666: Return array of pages as items instead of array of arrays magento#9823
  MAGETWO-69723: Email to a Friend feature magento#9824
  MAGETWO-69539: PHP "soap" extension is not declared in composer.json but can be used by Magento modules
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-63054: [Catalog] MSRP field is not displayed for bundle products with fixed price
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  ...
AntonEvers pushed a commit to AntonEvers/magento2 that referenced this pull request Jun 14, 2017
* develop: (60 commits)
  Fix typo in comment
  Move prefix and suffix default values to a new PR
  MAGETWO-68877: Issue magento#7988 Typo changed also added comments for each index, getters and setters. magento#9484
  Revert "MAGETWO-69728: Fixes layered navigation options being cached using the wrong store id. magento#9873"
  MAGETWO-67500: setup:di:compile returns exit code 0 if errors are found magento#7780
  Fix prefix, middle name and suffix were not prefilled in the checkout
  add middle name to checkout address html templates magento#8878
  Using Command output as message which actually provides more information for debugging than just the path
  Handling CLI error as a failure when validating composer.json file
  MAGETWO-69805: Return array of blocks as items instead of array of arrays magento#9157
  MAGETWO-69666: Return array of pages as items instead of array of arrays magento#9823
  MAGETWO-69723: Email to a Friend feature magento#9824
  MAGETWO-69539: PHP "soap" extension is not declared in composer.json but can be used by Magento modules
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-63054: [Catalog] MSRP field is not displayed for bundle products with fixed price
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants