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.5.x in develop #11689

Merged
merged 115 commits into from Dec 11, 2018

Conversation

Projects
None yet
@PierreRambaud
Copy link
Contributor

PierreRambaud commented Dec 10, 2018

Questions Answers
Branch? develop
Description? Synchronize 1.7.5.x into develop
Type? improvement
Category? CO
BC breaks? Nope
Deprecations? Nope
Fixed ticket? /
How to test? N/A

This change is Reviewable

jolelievre and others added some commits Nov 6, 2018

Merge pull request #11448 from jolelievre/clean-persian-install
Remove useless trad files in install for persian
Merge pull request #11463 from tomlev/issue-11253
fix admin translation redirect
Merge pull request #11279 from jolelievre/search-product
Allow product ordering on explicit request
Merge pull request #11466 from Quetzacoalt91/revert-separated-module-…
…buttons

Revert separated module buttons
Merge pull request #11457 from PierreRambaud/refactoring-filemanager
Refactoring filemanager/execute.php

PierreRambaud and others added some commits Dec 10, 2018

@PierreRambaud PierreRambaud force-pushed the PierreRambaud:merge2develop branch from 09fd4fb to 14c0c18 Dec 10, 2018

@PierreRambaud PierreRambaud force-pushed the PierreRambaud:merge2develop branch 3 times, most recently from 1e70b5a to fdc17fc Dec 10, 2018

@PierreRambaud PierreRambaud force-pushed the PierreRambaud:merge2develop branch from fdc17fc to 3b41da3 Dec 11, 2018

@jolelievre
Copy link
Contributor

jolelievre left a comment

@PierreRambaud nice dodge!

@jolelievre
Copy link
Contributor

jolelievre left a comment

Nice job @PierreRambaud

@Quetzacoalt91 Quetzacoalt91 merged commit d25604d into PrestaShop:develop Dec 11, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Quetzacoalt91

This comment has been minimized.

Copy link
Member

Quetzacoalt91 commented Dec 11, 2018

@PierreRambaud PierreRambaud deleted the PierreRambaud:merge2develop branch Dec 11, 2018

@PierreRambaud PierreRambaud added this to the 1.7.6.0 milestone Dec 19, 2018

@bilfeldt

This comment has been minimized.

Copy link

bilfeldt commented on 8aa170e Jan 21, 2019

@PierreRambaud Might I ask why the errors are HTML escaped but not the confirmation messages or the warnings?

A lot of error messages could contain for example links to more detailed explanation. This gets lost if we escape the errors.

This comment has been minimized.

Copy link
Contributor

PierreRambaud replied Jan 21, 2019

This is only in the default theme which is going to die very soon. It prevents multiple xss injection.

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