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

Merge of bug fixes from 1.7.6.x branch to develop #16051

Merged
merged 7 commits into from Oct 22, 2019

Conversation

@matks
Copy link
Contributor

matks commented Oct 21, 2019

Questions Answers
Branch? develop
Description? Merge of bug fixes from 1.7.6.x branch to develop
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Travis should be green

This change is Reviewable

jf-viguier and others added 7 commits Oct 15, 2019
Add rel="nofollow" to prestashop website link
Use product url (including combination) rather than canonical one in the miniatures
…roblem with Dotrine proxies
Remove final keyword from Lang entity
@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Oct 21, 2019
@prestonBot

This comment has been minimized.

Copy link
Collaborator

prestonBot commented Oct 21, 2019

Hi!

Your pull request description seems to be incomplete or malformed:

  • The category should be one of: FO, BO, CO, IN, TE, WS, LO

Would you mind completing the contribution table ? This would help us understand how interesting your contribution is.

Thank you!

(note: this is an automated message, but answering it will reach a real human )

@matks

This comment has been minimized.

Copy link
Contributor Author

matks commented Oct 21, 2019

@jolelievre can you confirm the merge did not break anything in themes/classic/templates/catalog/_partials/miniatures/product.tpl ? there was git conflicts, I fixed them but would feel safer with a validation

@matks matks added this to the 1.7.7.0 milestone Oct 22, 2019
@matks

This comment has been minimized.

Copy link
Contributor Author

matks commented Oct 22, 2019

Thanks for review !

@matks matks merged commit 32dfeae into PrestaShop:develop Oct 22, 2019
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
Travis CI - Pull Request Build Passed
Details
@matks matks deleted the matks:merge2develop-103 branch Oct 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.