Clone
 

got <pierrerambaud@users.noreply.github.com> in PrestaShop_v.1.5

Merge pull request #21464 from okom3pom/okom3pom-patch-12

index.html does not exist in INSTALL.txt

Merge pull request #21522 from jolelievre/merge-177

Merge 177x into develop 20/10/2020

Merge pull request #21490 from taoufiqaitali/patch-3

Title tag required to make html 5 valid

Merge pull request #21253 from marionf/issue-18701

Rename product price fields labels

Merge pull request #21497 from jolelievre/improve-behat-config

Improve behat config which did not use appropriate format for paths

Update src/Adapter/Order/OrderProductQuantityUpdater.php

Co-authored-by: Pablo Borowicz <pablo.borowicz@prestashop.com>

Update src/Adapter/Order/Refund/OrderProductRemover.php

Co-authored-by: Pablo Borowicz <pablo.borowicz@prestashop.com>

Update src/Adapter/Order/OrderAmountUpdater.php

Co-authored-by: Pablo Borowicz <pablo.borowicz@prestashop.com>

    • -1
    • +1
    /src/Adapter/Order/OrderAmountUpdater.php
Merge pull request #21458 from okom3pom/okom3pom-patch-9

Two Time actionAdminLoginControllerResetBefore

Update install-dev/upgrade/sql/1.7.7.0.sql

Co-authored-by: Progi1984 <progi1984@gmail.com>

Merge pull request #21360 from taoufiqaitali/patch-3

Change typo function name initOrderStatutsList

Merge pull request #20140 from Hlavtox/patch-10

Add hooks to cart modal - crosseling and promotion

Update controllers/front/listing/CategoryController.php

Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>

Update controllers/front/ProductController.php

    • -0
    • +3
    /controllers/front/ProductController.php
Merge pull request #21276 from ksaandev/patch-6

Fix typo in AdminController code

Update src/Core/Domain/Shop/ValueObject/ShopGroupId.php

Update controllers/front/listing/CategoryController.php

Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>

Merge pull request #21314 from PululuK/patch-18

Tools::getDefaultIndexContent() generates obsolete headers

Update controllers/front/listing/CategoryController.php

Merge pull request #21209 from zuk3975/fix/attachment/chmod

Lower permissions for attachment dummy file

Update classes/controller/AdminController.php

    • -3
    • +3
    /classes/controller/AdminController.php
Merge pull request #21223 from zuk3975/m/product/move-repository-ns

Introduce namespaces in adapter - Update, Validate, Repository. Move recent services.

Merge pull request #21158 from PierreRambaud/bump-version

Bump version to 1.7.6.8 in the installer

Update classes/Dispatcher.php

Update classes/Dispatcher.php

Update classes/Dispatcher.php

Update classes/Dispatcher.php

Merge pull request from GHSA-rc8c-v7rq-q392

Stored XSS in upload files

Merge pull request from GHSA-5cp2-r794-w37w

Don't use htmlentitiesdecode when sending email

Merge pull request from GHSA-fghq-8h87-826g

Escape location and ids when setting location