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 #9229

Merged
merged 60 commits into from Jun 28, 2018

Conversation

Projects
None yet
9 participants
@PierreRambaud
Contributor

PierreRambaud commented Jun 28, 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

SebBareyre and others added some commits May 29, 2018

[FO] Fix notice on brands page
Fix notice on brands page if there is no products linked to any manufacturer
Merge pull request #9181 from matks/fix_BOOM-5700_fix-outstanding-men…
…u-not-showing-in-b2b-mode

Use CustomerPreferencesFormHandler to handle specific tabs toggling for B2B mode
Merge pull request #9173 from mickaelandrieu/improved-module-template…
…-loader

Registered all namespaces in ModuleTemplateLoader class
Merge pull request #9183 from tomlev/missingTranslations
restore missing translation keys
Merge pull request #9189 from Quetzacoalt91/hide-disabled-tabs-in-BO
Hide disabled level 3 tabs in the BO
Merge pull request #9188 from jocel1/fix-inner-join-condition
Fix wrong test in left join condition

eternoendless and others added some commits Jun 25, 2018

Merge pull request #9221 from mickaelandrieu/BOOM-5833-fix-ssl-activa…
…tion

We should be able to activate SSL
Merge pull request #9223 from mickaelandrieu/make-preferences-form-de…
…pendent-of-request

SSL field is only available is accessed using HTTPS protocol
Merge pull request #9227 from PrestaShop/boom-4413
Add alt tag for images categories
Merge pull request #9138 from SebBareyre/patch-25
[FO] Fix notice on brands page
Merge pull request #9172 from tomlev/BOOM-5219-2
Fix auto-remove carrier-specific voucher when changing carrier
@Quetzacoalt91

🤞

@Quetzacoalt91 Quetzacoalt91 merged commit 4678be8 into PrestaShop:develop Jun 28, 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 28, 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