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 1.7.6.x to develop - 24/06/2019 #14340

Merged
merged 37 commits into from Jun 24, 2019

Conversation

@matks
Copy link
Contributor

commented Jun 24, 2019

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

This change is Reviewable

nesrine abdmouleh and others added some commits Jun 14, 2019

nesrine abdmouleh
Merge pull request #14296 from jolelievre/fix-carrier-email
Fix carrier display in order confirmation email
Merge pull request #14309 from jolelievre/install-first-language
Simplify the installation language to its minimum
Merge pull request #14221 from nesrineabdmouleh/fix_14_discount
Fix "14_discount/3_check_vouchers_in_FO" in full campaign
Merge pull request #14300 from Quetzacoalt91/and-operator-int
&= prevents result to be a boolean

matks added some commits Jun 21, 2019

Merge pull request #14316 from Quetzacoalt91/phpexcel-replacement-1.7.6
Reapply changes from PR switching on PHPSpreadsheet
Merge pull request #14298 from jolelievre/fix-mail-install
Fix english mail generation on fresh install
Merge pull request #14324 from PierreRambaud/fix/wording
Use Admin.Actions instead Admin.International.Help
Merge pull request #14325 from matks/handle-ajax-refresh-product-labels
Refresh product flags on ajax call when product page is refreshed

@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Jun 24, 2019

@PrestaShop PrestaShop deleted a comment from prestonBot Jun 24, 2019

@PierreRambaud PierreRambaud merged commit fbcd61a into PrestaShop:develop Jun 24, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jun 24, 2019

Thanks @matks

@PierreRambaud PierreRambaud added this to the 1.7.7.0 milestone Jun 24, 2019

@matks matks deleted the matks:merge176xtodevelop-28 branch Jun 24, 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.