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 into develop - 01/01/2020 #17000

Merged
merged 22 commits into from Jan 2, 2020
Merged

Conversation

@matks
Copy link
Contributor

matks commented Jan 1, 2020

Questions Answers
Branch? develop
Description? Merge last changes from 1.7.6.x to develop
Type? improvement
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? No QA needed

This change is Reviewable

eternoendless and others added 22 commits Nov 25, 2019
Prevent getter from changing class state
…oggle

Fix customer statuses not being able to toggle when optin field is required
Fix email not translated when installing a new language
Fix customer comment template
Fix yml config parse typo
Cost price & unit price are erased when saving with a supplier
Attributes bo_css & bo_theme can be empty
@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Jan 1, 2020
@matks matks mentioned this pull request Jan 1, 2020
@PrestaShop PrestaShop deleted a comment from prestonBot Jan 1, 2020
@matks

This comment has been minimized.

Copy link
Contributor Author

matks commented Jan 1, 2020

Travis is green but I need someone's approval to merge 😄

Copy link
Contributor

matthieu-rolland left a comment

lgtm

@matks matks merged commit 66dfde9 into PrestaShop:develop Jan 2, 2020
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
Travis CI - Pull Request Build Passed
Details
@matks matks added this to the 1.7.7.0 milestone Jan 2, 2020
@matks matks deleted the matks:merge2develop branch Jan 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.