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.3.x into develop #8623

Merged
merged 63 commits into from Dec 21, 2017

Conversation

Projects
None yet
7 participants
@eternoendless
Member

eternoendless commented Dec 19, 2017

Questions Answers
Branch? develop
Description? Merged 1.7.3.x into develop
Type? improvement
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? n/a
How to test? No testing required

This change is Reviewable

alegout and others added some commits Nov 15, 2017

CO: Code refacto, add options to not zip the release, not add the ins…
…taller and to specify a destination path.

alegout and others added some commits Dec 12, 2017

Merge pull request #8610 from mickaelandrieu/4469-size-function-undef…
…ined

Fixed undefined function .size using jQuery 3
Merge pull request #8608 from alegout/boom-4400
Missing japanese lang flag
Merge branch '1.7.3.x' into merge-173x
# Conflicts:
#	composer.json
#	src/PrestaShopBundle/Resources/views/Admin/Product/catalog.html.twig
#	src/PrestaShopBundle/Service/Hook/HookEvent.php

@eternoendless eternoendless requested a review from Quetzacoalt91 Dec 19, 2017

Show outdated Hide outdated app/config/config.yml Outdated

@PrestaShop PrestaShop deleted a comment from codacy-bot Dec 19, 2017

@codacy-bot

This comment has been minimized.

Show comment
Hide comment
@codacy-bot

codacy-bot Dec 19, 2017

Codacy Here is an overview of what got changed by this pull request:

Issues
======
+ Solved 5
- Added 1
           

Complexity decreasing per file
==============================
+ src/Core/Cldr/Composer/Hook.php  -2
+ src/PrestaShopBundle/Service/Hook/HookEvent.php  -1
+ controllers/admin/AdminLegacyLayoutController.php  -1
         

See the complete overview on Codacy

codacy-bot commented Dec 19, 2017

Codacy Here is an overview of what got changed by this pull request:

Issues
======
+ Solved 5
- Added 1
           

Complexity decreasing per file
==============================
+ src/Core/Cldr/Composer/Hook.php  -2
+ src/PrestaShopBundle/Service/Hook/HookEvent.php  -1
+ controllers/admin/AdminLegacyLayoutController.php  -1
         

See the complete overview on Codacy

@mickaelandrieu

e2e tests are broken

Duplicate removed

@Quetzacoalt91

This comment has been minimized.

Show comment
Hide comment
@Quetzacoalt91

Quetzacoalt91 Dec 19, 2017

Member

@fatmaBouchekoua, it seems we have some issue to close the welcome onboarding popup. Have you already heard of it?

Member

Quetzacoalt91 commented Dec 19, 2017

@fatmaBouchekoua, it seems we have some issue to close the welcome onboarding popup. Have you already heard of it?

@fatmaBouchekoua

This comment has been minimized.

Show comment
Hide comment
@fatmaBouchekoua

fatmaBouchekoua Dec 19, 2017

Contributor

@Quetzacoalt91, the problem is not related to the module Welcome because it was removed from the modules folder before installing.

Contributor

fatmaBouchekoua commented Dec 19, 2017

@Quetzacoalt91, the problem is not related to the module Welcome because it was removed from the modules folder before installing.

@Quetzacoalt91

This comment has been minimized.

Show comment
Hide comment
@Quetzacoalt91

Quetzacoalt91 Dec 19, 2017

Member

I wouldn't be so sure:

  1) Allscenario The Product Creation Create new product should click on the <add new product> button:

     Uncaught unknown error: Element <li class="maintab  has_submenu" id="subtab-AdminCatalog" data-submenu="9">...</li> is not clickable at point (105, 165). Other element would receive the click: <div class="onboarding-popup bootstrap">...</div>

  Error: An unknown server-side error occurred while processing the command.

      at elementIdClick("0.9599665873899925-5") - click.js:20:22

I guess the module is downloaded again during installation. Anyway, the script was supposed to close the modal if found, did we remove that part?

Member

Quetzacoalt91 commented Dec 19, 2017

I wouldn't be so sure:

  1) Allscenario The Product Creation Create new product should click on the <add new product> button:

     Uncaught unknown error: Element <li class="maintab  has_submenu" id="subtab-AdminCatalog" data-submenu="9">...</li> is not clickable at point (105, 165). Other element would receive the click: <div class="onboarding-popup bootstrap">...</div>

  Error: An unknown server-side error occurred while processing the command.

      at elementIdClick("0.9599665873899925-5") - click.js:20:22

I guess the module is downloaded again during installation. Anyway, the script was supposed to close the modal if found, did we remove that part?

let's wait for tests

@Quetzacoalt91

This comment has been minimized.

Show comment
Hide comment
@Quetzacoalt91

Quetzacoalt91 Dec 21, 2017

Member

Merging even if tests are failing, will be resolved in a specific PR

Member

Quetzacoalt91 commented Dec 21, 2017

Merging even if tests are failing, will be resolved in a specific PR

@Quetzacoalt91 Quetzacoalt91 merged commit 1b4f604 into PrestaShop:develop Dec 21, 2017

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Codacy/PR Quality Review Not so good... This pull request quality could be better.
Details

@eternoendless eternoendless added this to the 1.7.4.0 milestone Apr 13, 2018

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