Skip to content

[6.0] Upmerges - 2025-11-29 #46516

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
Merged
merged 20 commits into from
Nov 30, 2025
Merged

[6.0] Upmerges - 2025-11-29 #46516

merged 20 commits into from
Nov 30, 2025
+47 −14

Conversation

@Bodge-IT
Copy link
Contributor

@Bodge-IT Bodge-IT commented Nov 29, 2025

No description provided.

richard67 and others added 17 commits November 18, 2025 12:22
@richard67
Joomla! 5.4.1 Release Candidate 2
fe46bda
@richard67
Reset to dev
29709ef
@richard67
Joomla! 5.4.1
383e628
@richard67
Reset to dev
dc48d26
@LadySolveig
[5.4] Docs: Add a PR targeting section to the README (joomla#46471)
bfe3c8e
@bembelimen
[5.4] Fix static getTemplate call in mail template (joomla#46448)
3a8d986
@brianteeman
[5.4] Avoid fputcsv deprecation notice (joomla#46423)
4cff16c
@brianteeman
[5.4] php 8.5 version dates check (joomla#46480)
18ccd81
@brianteeman
[5.4] Remove last uses of JText (joomla#46473)
99ea2e7
@ThomasFinnern
[5.4] Fix webservice API config component: Component with numbers in …
5fab166 
…name get code 404 (joomla#46462)
@TLWebdesign
[5.4] Improve e-mail deliverability by aligning from and envelope-from (
27d273c 
joomla#46431)

Set the setSender auto flag to true so the DKIM and SPF domains will align the domain form the envelope-from and Return Path with the "from" e-mail address.
@MacJoom
[5.4] Fix condition to check request format in MenusHelper (joomla#46341
a64b016 
)

Thanks @MacJoom for this PR, and thanks @exlemor , @dautrich and @ceford for testing.

@MacJoom Could you create a new issue for the remaining router issue? Thanks in advance.
@joomla-translation-bot
[5.4] Translation Update (joomla#46505)
5a47dcb
@joomla-translation-bot
[5.4] Translation Update (joomla#46509)
518e8c9
@brbrbr
[5.4] success / message type not mapped to SymfonyStyle in ConsoleApp…
ae2b59c 
…lication (joomla#43739)
@LadySolveig
[5.4] autum dark-mode - remove border from sidebar wrapper and add bo…
94783ce 
…x-shadow (joomla#43202)
@richard67
[5.4] NPM audit fix indirect dev dependencies 2025-11-26 (joomla#46502)
d7f79a9
@Bodge-IT Bodge-IT added this to the Joomla! 6.0.2 milestone Nov 29, 2025
@Bodge-IT Bodge-IT requested a review from laoneo as a code owner November 29, 2025 20:06
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-6.0-dev Test instructions missing labels Nov 29, 2025
@joomla-cms-bot
Copy link

joomla-cms-bot commented Nov 29, 2025

Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks.
This is an automated message from the J!Tracker Application.

@Bodge-IT Bodge-IT requested a review from richard67 November 29, 2025 20:06
@brianteeman
Copy link
Contributor

brianteeman commented Nov 29, 2025

are you sure you should be updating packagelock.json in this PR - it looks like you end up downgrading versions if you do

@richard67
Copy link
Member

richard67 commented Nov 29, 2025

are you sure you should be updating packagelock.json in this PR - it looks like you end up downgrading versions if you do

@Bodge-IT Brian is right. You are downgrading dependencies with this update. Even more, you are adding back dependencies which were deliberately removed with 6.0. You really should check the changes in your upmerges.

Please ignore all package.json and package.lock changes in the upmerge, and instead of merging up the package-lock changes merge my PR #46503 .

@richard67
Copy link
Member

richard67 commented Nov 29, 2025

@Bodge-IT P.S. I don’t have time for a deeper review this weekend, so you should ask someone else to review.

@Bodge-IT Bodge-IT force-pushed the upmerges/2025-11-29 branch from d2c751a to e22bb31 Compare November 29, 2025 20:40
@Bodge-IT Bodge-IT requested a review from bembelimen November 29, 2025 20:42
@Bodge-IT
Copy link
Contributor Author

Bodge-IT commented Nov 29, 2025

Thank you @richard67 and @brianteeman for catching my mistake. I have amended the PR, albeit with an additional commit and requested additional reviewer.

@richard67
Copy link
Member

richard67 commented Nov 29, 2025

@Bodge-IT What I also don't understand. Why does this PR delete file administrator/components/com_content/src/View/Featured/HtmlView.php? The file exists in 5.4-dev and 6-0-dev.

@Bodge-IT Bodge-IT force-pushed the upmerges/2025-11-29 branch from e22bb31 to 693b37d Compare November 29, 2025 21:33
richard67
richard67 reviewed Nov 30, 2025
View reviewed changes
richard67
richard67 requested changes Nov 30, 2025
View reviewed changes
Copy link
Member

@richard67 richard67 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert the change in Version.php e.g. by applying my change suggestion.

@Bodge-IT Bodge-IT requested a review from richard67 November 30, 2025 14:54
richard67
richard67 requested changes Nov 30, 2025
View reviewed changes
@Bodge-IT Bodge-IT merged commit c0ff05c into joomla:6.0-dev Nov 30, 2025
42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richard67 richard67 richard67 approved these changes

@laoneo laoneo Awaiting requested review from laoneo laoneo is a code owner

@bembelimen bembelimen Awaiting requested review from bembelimen

Assignees

No one assigned

Labels

NPM Resource Changed This Pull Request can't be tested by Patchtester PR-6.0-dev Test instructions missing

Projects

None yet

Milestone

Joomla! 6.0.2

Development

Successfully merging this pull request may close these issues.