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

Merge 1.7.4.x in develop #9146

Merged
merged 49 commits into from May 31, 2018

Conversation

Projects
None yet
8 participants
@PierreRambaud
Contributor

PierreRambaud commented May 31, 2018

Questions Answers
Branch? develop
Description? self described
Type? improvement
Category? CO
BC breaks? no
Deprecations? no
How to test? Tests should pass

This change is Reviewable

SebBareyre and others added some commits Apr 11, 2018

[BO] fix display error on module selection list
Fix error display on module selection list.
Merge pull request #9026 from Quetzacoalt91/cherry-pick-8932
Fixed display error on back office module selection list
Fix Punycode problem
Since domain are allowed in UTF-8, some don't respect the
RFC 2822, so to prevent error with this version of SwiftMailer (could
not update due to PHP requirements), we must convert domain name in
Punycode.
Thanks Wikipédia: https://en.wikipedia.org/wiki/Punycode
Error while searching for a product
Prevent error: Parameter must be an array or an object that
implements Countable
Florian Nolte
Follow-up to update in contactform: display GDPR consent checkbox in …
…contactform.

This is a follow-up to adjust the classic theme to the change suggested in PrestaShop/contactform#21
cs
Merge pull request #9099 from florian-nolte/gdpr
Follow-up to: display GDPR consent checkbox in contactform

eternoendless and others added some commits May 23, 2018

Merge pull request #9080 from PierreRambaud/fix/boom-4398
 Fix Punycode problem when register
Fixed login icons not showing up.
FontAwesome must come before sans-serif or else it won't be used by the browser.
Merge pull request #9104 from Joukz/gdpr_compliance_1.7
Add compliance to GDPR law for ps_emailsubscription module
cs
Merge pull request #9028 from mickaelandrieu/bogoss/reusable-authoriz…
…ation-system

Introduced re-usable authorization system
Merge pull request #9089 from Quetzacoalt91/BOOM-5480
Catch module theme installation error, add error message for invalid module
Merge pull request #9082 from PierreRambaud/fix/boom-5549
 Error while searching for a product
Merge pull request #9134 from marionf/boom-5626
Fix undefined index on supplier page in FO
Merge pull request #9143 from marionf/boom-5640
Fix unknown key route error in customer settings page

@mickaelandrieu mickaelandrieu merged commit 9bd0b79 into PrestaShop:develop May 31, 2018

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mickaelandrieu

This comment has been minimized.

Contributor

mickaelandrieu commented May 31, 2018

Thanks @PierreRambaud !

@PierreRambaud PierreRambaud deleted the PierreRambaud:merge/1.7.4.x branch May 31, 2018

@eternoendless eternoendless added this to the 1.7.5.0 milestone Jun 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment