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.

Sign up for GitHub

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

Jump to bottom

Merge 1.7.4.x in develop #9229

Merged
merged 60 commits into from
Jun 28, 2018
Merged

Merge 1.7.4.x in develop #9229

merged 60 commits into from
Jun 28, 2018

Conversation

PierreRambaud
Copy link
Contributor

@PierreRambaud PierreRambaud commented Jun 28, 2018 •
edited by eternoendless
Loading

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 30 commits May 29, 2018 11:49
@SebBareyre
[FO] Fix notice on brands page
13f4307 
Fix notice on brands page if there is no products linked to any manufacturer
@tomlev
fix autoremove voucher when changing carrier
8cbd05e
@tomlev
fix copyright
47635f7
@tomlev
add comment
d1b95fb
@tomlev
fix smarty condition count
25fd245
@mickaelandrieu
Registered all namespaces in ModuleTemplateLoader class
f029f01
@mickaelandrieu
Allow override of a product line row only
fd2284a
@mickaelandrieu
Added unit tests
ff01f53
@mickaelandrieu
Fixed CS
04967f9
@mickaelandrieu
Fixed PHP_EOL position
8e3eaf0
@matks
Use CustomerPreferencesFormHandler to handle specific tabs toggling w…
6aa2550 
…hen B2B mode is switched
@tomlev
restore missing translation keys
591c37a
@tomlev
fix copyright dates
7ebb00f
@tomlev
fix duplicates
a497a24
@tomlev
fix typo
960bee8
@mickaelandrieu
Merge pull request #9181 from matks/fix_BOOM-5700_fix-outstanding-men…
da6da3f 
…u-not-showing-in-b2b-mode

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

Registered all namespaces in ModuleTemplateLoader class
@tomlev
fix language references
7464809
@mickaelandrieu
Merge pull request #9183 from tomlev/missingTranslations
6307eeb 
restore missing translation keys
@jocel1
fix wrong test in left join condition
df0a7a4
@Quetzacoalt91
Hide disabled level 3 tabs in the BO
1511e82
@Quetzacoalt91
Merge pull request #9189 from Quetzacoalt91/hide-disabled-tabs-in-BO
3fbc98e 
Hide disabled level 3 tabs in the BO
@eternoendless
Merge pull request #9188 from jocel1/fix-inner-join-condition
28a0118 
Fix wrong test in left join condition
@eternoendless
Updated translation catalog
92d9606
@Quetzacoalt91
Handle 1.7 method in update function 'add_new_tab'
e55d406
@Quetzacoalt91
Apply strtoupper
47cf1f5
@eternoendless
Fix wrong translation domain
d5a0fd3
@eternoendless
Fix duplicate wording
5e98c9c
@Quetzacoalt91
Explicit declaration of new method for 1.7
14ac402
@eternoendless
Merge pull request #9197 from eternoendless/fix-duplicate-wording
ba2a2c4 
Fix duplicate wording
eternoendless and others added 18 commits June 25, 2018 14:32
@eternoendless
Merge pull request #9212 from eternoendless/fix-rtl-style
0329947 
Fix position of PrestaShop logo when in RTL
@eternoendless
Update native modules
bb1b82a
@PierreRambaud
Implement PKCS#7 padding
c321d07
@eternoendless
Make deprecation warnings opt-in
7c05d17
@mickaelandrieu
Make SSL form only available in HTTPS
2b5c777
@eternoendless
Merge pull request #9222 from PierreRambaud/improve-mcrypt-mac-1.7.3
e98a0a3 
Improve cookie encryption
@eternoendless
// Changelog 1.7.3.4
335851e
@Quetzacoalt91
Merge pull request #9221 from mickaelandrieu/BOOM-5833-fix-ssl-activa…
e2a7ee3 
…tion

We should be able to activate SSL
@mickaelandrieu
SSL field is only available is accessed using HTTPS protocol
f13c616
@mickaelandrieu
Merge pull request #9223 from mickaelandrieu/make-preferences-form-de…
fa240ff 
…pendent-of-request

SSL field is only available is accessed using HTTPS protocol
Add alt tag for images categories
a76aeaf
@eternoendless
Merge '1.7.3.x' into 1.7.4.x
2835169
Add condition on the meta title
0bb7d3f
@PierreRambaud
Merge pull request #9227 from PrestaShop/boom-4413
ce62b49 
Add alt tag for images categories
@PierreRambaud
Merge pull request #9216 from eternoendless/fix-deprecation-notice
3dc233e 
Make deprecation warnings opt-in
@PierreRambaud
Merge pull request #9138 from SebBareyre/patch-25
a3e72f3 
[FO] Fix notice on brands page
@PierreRambaud
Merge pull request #9172 from tomlev/BOOM-5219-2
745b34d 
Fix auto-remove carrier-specific voucher when changing carrier
@PierreRambaud
Merge branch '1.7.4.x' of github.com:PrestaShop/PrestaShop into merge…
fbfcbb1 
…-2-develop
@prestonBot prestonBot added develop Branch Waiting for wording Status: action required, waiting for wording Needs port on StarterTheme labels Jun 28, 2018
@PierreRambaud PierreRambaud removed Needs port on StarterTheme Waiting for wording Status: action required, waiting for wording labels Jun 28, 2018
@PierreRambaud PierreRambaud modified the milestone: 1.7.5.0 Jun 28, 2018
@PierreRambaud PierreRambaud added the Improvement Type: Improvement label Jun 28, 2018
Quetzacoalt91
Quetzacoalt91 approved these changes Jun 28, 2018
View reviewed changes
Copy link
Member

@Quetzacoalt91 Quetzacoalt91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤞

@Quetzacoalt91 Quetzacoalt91 merged commit 4678be8 into PrestaShop:develop Jun 28, 2018
@PierreRambaud PierreRambaud deleted the merge-2-develop branch June 28, 2018 13:25
@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
Reviewers

@Quetzacoalt91 Quetzacoalt91 Quetzacoalt91 approved these changes

Assignees
No one assigned
Labels
develop Branch Improvement Type: Improvement
Projects
None yet
Milestone
1.7.5.0
Development

Successfully merging this pull request may close these issues.
8 participants
@PierreRambaud @Quetzacoalt91 @prestonBot @SebBareyre @tomlev @mickaelandrieu @jocel1 @eternoendless