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 to develop #15076

Merged
merged 96 commits into from Aug 13, 2019

Conversation

@matks
Copy link
Contributor

commented Aug 12, 2019

Questions Answers
Branch? develop
Description? Merge of bug fixes from 1.7.6.x branch to develop
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Travis should be green

This change is Reviewable

Quetzacoalt91 and others added 30 commits Jul 12, 2019
Fix Orders view page link to transform guest to customer
Do not use encodeURIComponent with POST data
…symfony requirements
Fix log delete all action on Logs page
Fix unclosed div tag
Keep Composer.lock file in release
Cannot save the "No Picture Image"
…uring-upgrade-from-earlier-major-versions

Init properly the Kernel on major *manual* upgrades
Update precision and numeric iso code of currencies
Bad currency format for Czech language
eternoendless and others added 12 commits Aug 1, 2019
This change reverts #13088

Before this change, ALL edited wordings would be attached to the current theme, which only make sense when we're editing a theme's translations. Also, in the later case, it should be the *selected* theme and no the *current* theme.
Scan translation keys from email themes
Fix supplier display after import
Manage edit/view link for customers in HelperList
…blems

Improve translation test module
Fix error preventing to translate backoffice wordings when using a theme other than classic
Fix translations
@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Aug 12, 2019
@PrestaShop PrestaShop deleted a comment from prestonBot Aug 12, 2019
@@ -16,20 +16,22 @@
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to https://www.prestashop.com for more information.
* needs please refer to http://www.prestashop.com for more information.

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Reverted update => bad

@@ -16,20 +16,43 @@
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to https://www.prestashop.com for more information.
* needs please refer to http://www.prestashop.com for more information.

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Bad git merge

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Actually it comes from 1.7.6.x files => licensing headers are outdated

*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Needs to be updated

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Actually it comes from 1.7.6.x files => licensing headers are outdated

@@ -1,4 +1,4 @@
<?php
AdminManufacturersController<?php

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

😱

This comment has been minimized.

Copy link
@matks

matks Aug 12, 2019

Author Contributor

Fixed

Copy link
Contributor

left a comment

LGTM

@matks matks added this to the 1.7.7.0 milestone Aug 13, 2019
@matks matks merged commit d09093e into PrestaShop:develop Aug 13, 2019
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@matks matks deleted the matks:merge176xtodevelop-35 branch Aug 13, 2019
@matks

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

Thanks @matthieu-rolland for the review

@matks

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

License headers to be fixed in #15092

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.