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 branch #15306

Merged
merged 32 commits into from Aug 30, 2019

Conversation

@jolelievre
Copy link
Contributor

commented Aug 29, 2019

Questions Answers
Branch? develop
Description? Pull branch 176
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket? ~
How to test? ~

This change is Reviewable

nesrine abdmouleh and others added 30 commits Jun 25, 2019
nesrine abdmouleh
… step has a continue button
- change getTranslator's parameter name
- add comments
- improve phpdoc
Only disable following steps in the checkout process when the current step has a continue button
Get all categories in category tree form (not only enabled ones)
Keep BO from using two different translators in parallel
Update version to 1.7.6.1
Fix abstract service declaration
- Module translations are no longer attached to the currently selected theme
- Email translations no longer are attached to an invalid theme called "subject"
Make module and email translations work again when using a theme other than classic
Fix "02_autoupgrade" in install_upgrade campaign
CLDR has access to all currencies regardless of the current shop
Update contributors and changelog for 1.7.6.1
@jolelievre jolelievre requested a review from PrestaShop/prestashop-core-developers as a code owner Aug 29, 2019
@prestonBot

This comment has been minimized.

Copy link
Collaborator

commented Aug 29, 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 )

@PierreRambaud PierreRambaud changed the title Pull 176 Merge 1.7.6.x into develop branch Aug 29, 2019
@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Aug 29, 2019

Hum, you forget to build assets?

@jolelievre

This comment has been minimized.

Copy link
Contributor Author

commented Aug 29, 2019

Hum, you forget to build assets?

No I made a mistake and didn't start from the right branch I need to remake the PR

@jolelievre jolelievre force-pushed the jolelievre:pull-176 branch from a8dbaa9 to 095e3dc Aug 29, 2019
@matks

This comment has been minimized.

Copy link
Contributor

commented Aug 30, 2019

Thank you @jolelievre

@matks matks merged commit 105c591 into PrestaShop:develop Aug 30, 2019
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jolelievre jolelievre deleted the jolelievre:pull-176 branch Oct 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.