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

Sync with OpenMage #5

Merged
merged 45 commits into from
Apr 9, 2024
Merged

Sync with OpenMage #5

merged 45 commits into from
Apr 9, 2024

Conversation

sreichel
Copy link

...

ADDISON74 and others added 28 commits February 21, 2024 09:07
@ADDISON74 @kiatng
Fixed null parameter warning in Mage/Adminhtml/Block/Customer/Edit/Ta…
d3ab364 
…b/Wishlist/Grid/Renderer/Description.php (#3829)

* Update Description.php

* removing-cast

* update-return

Co-authored-by: Ng Kiat Siong <[email protected]>

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
@kyrena @fballiano @ADDISON74
New feature: added auto reply to contact form (#3615)
e6a6b04 
Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: ADDISON <[email protected]>
@kiatng @fballiano
Fixed phpstan in Mage/Customer/controllers/AccountController.php (#3750)
1834708 
* Fixed phpstan in Mage/Customer/controllers/AccountController.php

* Fixed preDispatch() return type.

* Deprecated _getModel().

---------

Co-authored-by: Fabrizio Balliano <[email protected]>
@AlterWeb @fballiano
New feature: added partial postcode match to table rate shipping (#1504)
ef34421 
Co-authored-by: Fabrizio Balliano <[email protected]>
@andrewcbi
Changed "unload" to "beforeunload" in extjs to avoid deprecation warn…
9f85ccd 
…ing in developer console (#3853)
@dependabot
Bump phpunit/phpunit from 9.6.16 to 9.6.17 (#3854)
cfac8e0
@dependabot
Bump phpseclib/mcrypt_compat from 2.0.4 to 2.0.5 (#3855)
9ec1e69
@dependabot
Bump friendsofphp/php-cs-fixer from 3.49.0 to 3.50.0 (#3857)
0ea5dd7
@fballiano
Removed Mage_Backup and Mage_PageCache from PHPStan configuration (#3858
3f6db4d 
)
@fballiano
New feature: added support for type "label" to system.xml (#3849)
6f441b5
@dependabot @fballiano
Bump phpstan/phpstan from 1.10.58 to 1.10.59 (#3856)
cbf384a 
Co-authored-by: Fabrizio Balliano <[email protected]>
@ADDISON74
Fixed column default sorting in customer's orders grid (#3852)
fef1c08
@ADDISON74 @kiatng
Fixed null parameter warning in DataFlow Profiles (#3827)
63293af 
Co-authored-by: Ng Kiat Siong <[email protected]>
@Judx
Merge pull request from GHSA-gp6m-fq6h-cjcx
8d00914
@fballiano
Version bump in preparation for next release
4176402
@fballiano
PHPCS fix for commit 8d00914
5b84ee1
@fballiano
Fixed zIndex to avoid conflicts between TinyMCE and OpenMage's overla…
40dcee7 
…ys in the CMS section (#3851)
@fballiano @sreichel
Fixed default width for input/textarea in OpenMage backend theme (#3850)
94f08e1 
Co-authored-by: Sven Reichel <[email protected]>
@luigifab @fballiano @kiatng
Improved fields dependence (show/hide) in backend's config section (#…
ac50a6a 
…2150)

Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: Ng Kiat Siong <[email protected]>
@fballiano
Varien_Directory_Collection::getLastDir(): "$this" can no longer be u…
4caaafe 
…sed in a plain function or method, since PHP 7.1 (#3823)
@dependabot
Bump phpseclib/phpseclib from 3.0.35 to 3.0.37 (#3869)
8832921
@dependabot
Bump phpseclib/mcrypt_compat from 2.0.5 to 2.0.6 (#3868)
a772a7d
@dependabot
Bump friendsofphp/php-cs-fixer from 3.50.0 to 3.51.0 (#3867)
db3e41c
@kiatng
Fixed null error on hash_equal in Mage_Oauth_Model_Server (#3870)
40c9f1c
@ADDISON74
Fixed row click issue in Category Products tab (#3866)
304a23c
@kiatng
Fixed null deprecation in lib/Varien/Filter/Template.php (#3879)
49ea65a
@ADDISON74 @fballiano
Fixed row click issue in product's upsell/crosssell/related grids (#3865
2bb591e 
)

Co-authored-by: Fabrizio Balliano <[email protected]>
@dependabot
Bump tj-actions/changed-files from 42 to 43 (#3882)
a81c0d2
@github-actions github-actions bot added environment Component: Catalog Relates to Mage_Catalog labels Mar 18, 2024
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Mar 21, 2024
@github-actions github-actions bot added the Template : rwd Relates to rwd template label Mar 28, 2024
@github-actions github-actions bot added Component: Checkout Relates to Mage_Checkout Component: Page Relates to Mage_Page labels Mar 29, 2024
@github-actions github-actions bot added the Component: Api PageRelates to Mage_Api label Apr 1, 2024
@github-actions github-actions bot added Component: PayPal Relates to Mage_Paypal Component: Core Relates to Mage_Core Component: Downloadable Relates to Mage_Downloadable Component: CatalogSearch Relates to Mage_CatalogSearch labels Apr 2, 2024
@github-actions github-actions bot added the Component: Widget Relates to Mage_Widget label Apr 8, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 8, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@sreichel sreichel merged commit f17443e into openmage-strict:main Apr 9, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Component: Adminhtml Relates to Mage_Adminhtml Component: Api PageRelates to Mage_Api Component: Catalog Relates to Mage_Catalog Component: CatalogSearch Relates to Mage_CatalogSearch Component: Checkout Relates to Mage_Checkout Component: Contacts Relates to Mage_Contacts Component: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Downloadable Relates to Mage_Downloadable Component: ImportExport Relates to Mage_ImportExport Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Oauth Relates to Mage_Oauth Component: Page Relates to Mage_Page Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales Component: Shipping Relates to Mage_Shipping Component: Widget Relates to Mage_Widget composer Relates to composer.json documentation Improvements or additions to documentation environment JavaScript Relates to js/* Mage.php Relates to app/Mage.php phpstan Template : admin Relates to admin template Template : rwd Relates to rwd template translations Relates to app/locale
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@sreichel @empiricompany @ADDISON74 @kyrena @kiatng @AlterWeb @andrewcbi @fballiano @Judx @luigifab