Clone
 

atomiix <thomas.baccelli@prestashop.com> in PrestaShop_v.1.5

Merge pull request #21569 from matks/restore-ubuntu-latest-GA-phpstan

Use ubuntu Latest for PHPStan GA

Merge pull request #21351 from PululuK/patch-18

BO - Import CSV - sample for manufacturer not OK

Merge pull request #21258 from Xaconi/develop

Added 404 page without redirections on category page if category doesn't exists

Merge pull request #21114 from idnovate/css-fix

Fixed CSS issues when using DisplayProductPriceBlock

Merge pull request #21432 from Progi1984/issue21430

Fixed Configuration when Disabling/Enabling Shop

Merge pull request #21326 from sowbiba/fix-discount-secondary-currency

Set order currency to added cart rule

Merge pull request #21211 from SebSept/patch-5

"/build/" was defined twice in .gitignore root file

Merge pull request #20338 from SuichiM/fixes/20194

Fix guest tracking without friendly URLs

Merge pull request #19703 from atomiix/fix/17597

Handle empty states for category grids

Merge pull request #21040 from boubkerbribri/test-sort-stores

Add test 'Sort Stores'

Update src/Core/Grid/Presenter/GridPresenter.php

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

    • -2
    • +3
    /src/Core/Grid/Presenter/GridPresenter.php
Update controllers/admin/AdminFeaturesController.php

Co-authored-by: GoT <PierreRambaud@users.noreply.github.com>

    • -1
    • +1
    /controllers/admin/AdminFeaturesController.php
Merge pull request #20909 from kpodemski/fix/invalid-address-color

Cleaner way to have highlighted text on invalid address

Merge pull request #20717 from mvorisek/fix_private_final_method

Fix private final method

Merge pull request #20598 from atomiix/fix/20594

Do not reconvert discounts

Merge pull request #20644 from atomiix/fix/20643

Check for address id before creating CartAddress

Merge pull request #20211 from Sinepel/feature/fix_missing_pagination_hreflang

Fix missing pagination for alternative lang url

Merge pull request #20571 from atomiix/fix/20568

Return an int instead of a float (in some cases) for Pack::getQuantity()

Merge pull request #20066 from atomiix/release-1767

Release 1.7.6.7

Merge pull request #19010 from atomiix/fix/18723

Added missing required_once for Datas class

Merge pull request #19347 from prestamodule/patch-112

Use Country from global namespace

Merge pull request #18531 from matks/remove-bad-die

Remove irrelevant die() and throw exception instead

Merge pull request #18530 from PierreRambaud/fix/cs-fixer

Indentation is broken due to missing cs fixer configuration

Merge pull request #18504 from jolelievre/guest-wording

Fix wording in classic guest mail template

Merge pull request #17436 from NeOMakinG/webpack-update-default-theme

Update BO theme/default webpack to v4.41 and its dependencies

Merge pull request #18294 from atomiix/fix-orders-filters-dates

Return null when value is an empty string in ArabicToLatinDigitDataTransformer

Merge pull request #17889 from matthieu-rolland/add-hook-update

Add displayAdditionalCustomerAddressFields hook during update

Merge pull request #17457 from sowbiba/disable-add-to-cart-unavailable-combination

Disable add-to-cart button when product/attribute combination is not available

Merge pull request #17645 from atomiix/backport-16927

Backport #16927

Merge pull request #17535 from atomiix/deleted-customer-order

Fix deleted customer's order preview/details