Skip to content

[UPMERGE] 5.0 -> next#2968

Merged
dpfaffenbauer merged 27 commits intonextfrom
upmerge/5.0_next
Feb 5, 2026
Merged

[UPMERGE] 5.0 -> next#2968
dpfaffenbauer merged 27 commits intonextfrom
upmerge/5.0_next

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Feb 5, 2026

This PR has been generated automatically.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/next -m "Resolve conflicts between 5.0 and next"

dpfaffenbauer and others added 27 commits January 20, 2026 08:04
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Modified objectMultihref.js to iterate through all selected records in
data.records instead of only processing the first record. This enables
users to select multiple data objects (products, categories, customers,
etc.) and drag them all at once into condition lists.

Fixes the issue where each data object had to be added individually to
condition lists in cart price rules, product price rules, shipping rules,
and other rule configurations.

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
…OrderShipmentController

Replace exception messages and stack traces in client responses with generic error
messages. Detailed error information is now logged server-side using LoggerInterface.

Fixes security vulnerability where internal implementation details were exposed to clients.

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Address code review feedback to return appropriate error status code
instead of HTTP 200 when an error occurs during PDF rendering.

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
… pattern

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Address code review feedback to use for-of loops for simpler iteration
over data.records arrays in both onNodeOver and onNodeDrop handlers.

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
…over

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Fix outdated Menu Bundle docs for ExtJs event handling
…ort-again

Add multi-select drag & drop support for objectMultihref condition lists
Address review feedback to remove logging calls and simplify error responses
while still preventing information exposure.

Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
…rkets

Add CLI command for setting up states/regions for additional countries
Co-authored-by: dpfaffenbauer <5981845+dpfaffenbauer@users.noreply.github.com>
[MessengerBundle] Add auto-refresh and chart tooltip
…re-issue

Fix information exposure in OrderInvoiceController and OrderShipmentController
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 5, 2026

@dpfaffenbauer dpfaffenbauer merged commit 6ad5343 into next Feb 5, 2026
164 of 167 checks passed
@dpfaffenbauer dpfaffenbauer deleted the upmerge/5.0_next branch February 5, 2026 08:10
@github-actions github-actions bot locked and limited conversation to collaborators Feb 5, 2026
@github-actions github-actions bot restored the upmerge/5.0_next branch February 6, 2026 04:19
@github-actions github-actions bot deleted the upmerge/5.0_next branch February 7, 2026 04:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants