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 v19 -> v20 #2697

Merged
merged 32 commits into from
Nov 30, 2022
Merged

Merge v19 -> v20 #2697

merged 32 commits into from
Nov 30, 2022

Commits on Nov 8, 2022

  1. PHPStan: Force PHP version to 8.0

    @fballiano
    fballiano committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    d889083 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Do not autoload captcha class when disabled

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    cb8fdbb View commit details
    Browse the repository at this point in the history

  2. Added helper method

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    bf4433b View commit details
    Browse the repository at this point in the history

  3. Do not crash when shipment does not exist (#2683) 

    * Do not crash when shipment does not exist

* Redirect to grid if shipment doesn't exist.

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
    @luigifab @kiatng @fballiano
    2 people authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    04b666f View commit details
    Browse the repository at this point in the history

  4. Trimmed whitespace from some files (#2698)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    f114484 View commit details
    Browse the repository at this point in the history

  5. Reduced getId() calls again (#2699)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    bc09dde View commit details
    Browse the repository at this point in the history

  6. Backend: when editing a bundle product you now have a link to the "bu… 

    …ndled" products edit page (#2701)
    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    17a9e0b View commit details
    Browse the repository at this point in the history

  7. Remove obsolete ACL resources from DB (#2706) 

    * Remove obsolete ACL resources from DB

* Update app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.3-1.6.1.4.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
    @sreichel @kiatng @fballiano
    2 people authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    e6dc7dc View commit details
    Browse the repository at this point in the history

  8. Allow labeler to fail (#2710)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    ef1cb3e View commit details
    Browse the repository at this point in the history

  9. Bugfix to make exchange rate data with fixer.io work again (#2694) 

    * Bugfix to make exchange rate data with fixer.io work again

* Added service URL to system config.xml

* Use $_url property

* Added $_url property to abstract class

* Invalid closing tag

Co-authored-by: Sven Reichel <github-sr@hotmail.com>
    @dbachmann @sreichel @fballiano
    2 people authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    57ecfe5 View commit details
    Browse the repository at this point in the history

  10. Fixes typo in join alias in EAV Indexer (#2711)

    @rubanooo @fballiano
    rubanooo authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    09b4736 View commit details
    Browse the repository at this point in the history

  11. Removed support for eAccelerator Cache Backend (#2712)

    @fballiano
    fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    da44d97 View commit details
    Browse the repository at this point in the history

  12. Backend: Set the right menu for reviews (#2680)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    bbba05b View commit details
    Browse the repository at this point in the history

  13. Version bump (#2714)

    @fballiano
    fballiano committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    101b8d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Added confirmation before deleting website/store/storeview (#2717)

    @fballiano
    fballiano committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    1a013b4 View commit details
    Browse the repository at this point in the history

  2. Fixed typo in copyright docblock (#2740)

    @fballiano
    fballiano committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    66604fc View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Backend: Added method code in payment method list (#2735)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    c37562b View commit details
    Browse the repository at this point in the history

  2. Backend: Set width:auto for td.massaction (#2718)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    ab62878 View commit details
    Browse the repository at this point in the history

  3. Fix data.title replace when it's null/undefined (#2719)

    @luigifab @fballiano
    luigifab authored and fballiano committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    5195161 View commit details
    Browse the repository at this point in the history

  4. Add PHPCodeSniffer to workflow (#2708)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    43557e6 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Converted all (bool)getStoreConfig() calls to getStoreConfigFlag() (#… 

    …2747)
    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 20, 2022
    Configuration menu
    Copy the full SHA
    0a13e00 View commit details
    Browse the repository at this point in the history

  2. Replaced full class name with self (#2749)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 20, 2022
    Configuration menu
    Copy the full SHA
    676a4df View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Updated phpdocs: return $this (#2751)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    971b58b View commit details
    Browse the repository at this point in the history

  2. Fixed incorrect docblock for setLastRealOrderId() and getLastRealOrde… 

    …rId() (#2752)
    @kiatng @fballiano
    kiatng authored and fballiano committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    9828e85 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. CSS merge logs exception if file is missing, but doesn't break (#2754)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    e9d2d75 View commit details
    Browse the repository at this point in the history

  2. CS Fix for Merge v19 -> v20 

    * Fix for #2315
* Fix for #1149
    @sreichel
    sreichel authored Nov 22, 2022
    Configuration menu
    Copy the full SHA
    cd5bd80 View commit details
    Browse the repository at this point in the history

  3. Updated phpstan-baseline.neon

    @sreichel
    sreichel committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    9f1a13d View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2022

  1. Backport: #2315 (#2746)

    @sreichel @fballiano
    sreichel authored and fballiano committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    ae95ef3 View commit details
    Browse the repository at this point in the history

  2. Fixed setting of source_model when adding new attribute and for multi… 

    …select (#1293)
    @kiatng @fballiano
    kiatng authored and fballiano committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    9b02cf2 View commit details
    Browse the repository at this point in the history

  3. Remove declared properties accessed by magic getter in Paypal Config (#… 

    …2759)

* Remove properties accessed from the magic getter

* Add properties to class phpdocs

Co-authored-by: Sven Reichel <github-sr@hotmail.com>
    @elidrissidev @sreichel @fballiano
    2 people authored and fballiano committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    d35112c View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2022

  1. Fixed order comment REST endpoint route param (#2750)

    @elidrissidev @fballiano
    elidrissidev authored and fballiano committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    0cf0019 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Updated phpstan-baseline.neon

    @sreichel
    sreichel committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    c82b9e1 View commit details
    Browse the repository at this point in the history