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.4.x in develop #9182

Merged
merged 44 commits into from Jun 13, 2018

Conversation

Projects
None yet
8 participants
@PierreRambaud
Contributor

PierreRambaud commented Jun 12, 2018

Questions Answers
Branch? develop
Description? self described
Type? improvement
Category? CO
BC breaks? no
Deprecations? no
How to test? Tests should pass

This change is Reviewable

PierreRambaud and others added some commits May 30, 2018

Regression with DatePicker and checkboxes on stock page
DatePicker field not working due to wrong css selector.
And because it can be on every page, run datepicker function
directly on theme.js. Fix problem where we can't check checkboxes
on the stock page.
Merge pull request #9151 from Quetzacoalt91/addons-ctrl-trans
Fix undefined method trans() when loggin on the marketplace from the module page
Merge pull request #9157 from PierreRambaud/fix/boom-5652
State filter in catalog page doesn't work
Merge pull request #9133 from PierreRambaud/fix/datepicker
Regression with DatePicker and checkboxes on stock page (catalogue > stock)
Fix header on default theme
+ Remove icons from quick links
Update to UI kit 1.0.1
Used NPM 6, hence the big diff in package-lock
Merge pull request #8914 from sLorenzini/FF-169
Clean Header BO design for merchant

eternoendless and others added some commits Jun 5, 2018

Merge pull request #9160 from PierreRambaud/fix/boom-5659
Fix 500 while getting order total
Merge pull request #9169 from tomlev/BOOM-5675
fix product attachment list
@eternoendless

This comment has been minimized.

Member

eternoendless commented Jun 13, 2018

Thank you @PierreRambaud

@eternoendless eternoendless merged commit 0855d41 into PrestaShop:develop Jun 13, 2018

1 of 2 checks passed

Codacy/PR Quality Review Not up to standards. This pull request quality could be better.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@PierreRambaud PierreRambaud deleted the PierreRambaud:merge-2-develop branch Jun 13, 2018

@PierreRambaud PierreRambaud added this to the 1.7.5.0 milestone Oct 19, 2018

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