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

[5.3] Upmerge changes from 5.2-dev 2024-11-11 #44434

Merged
merged 36 commits into from
Nov 13, 2024
Merged

[5.3] Upmerge changes from 5.2-dev 2024-11-11 #44434

merged 36 commits into from
Nov 13, 2024

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Nov 11, 2024 •
edited
Loading

Pull Request for Issue # .

Summary of Changes

This pull request (PR) merges the changes from 5.2-dev up into 5.3-dev which have been made since the last upmerge with PR #44367 , which includes the file permissions (mode) changes in the git index of the repository from commit 9b13ba2 .

In addition this PR fixes the javascript-cs step failing in Drone due to a missing trailing comma in file tests/System/plugins/fs.mjs . In the 5.2-dev branch the linter doesn't complain about that, but here it does. I have created PR #44435 for the 5.2-dev branch to fix it there, too, and will later handle the conflict when doing the next upmerge for 5.3-dev.

Testing Instructions

Review. Check the commits of this PR and those in the 5.2-dev branch, and check the code changes and the file permissions (mode) changes in this PR.

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

alikon and others added 28 commits October 29, 2024 13:45
@alikon
[cypress] + com_scheduler (joomla#44239)
59dbd1a 
* cy.scheduler5

* cs

* eol

* 5

* Delete 0composer.lock

* five

* del
@heelc29
[5.2] add test for site router (sef) (joomla#44253)
0662f56 
* [5.2] add test for site router (sef)

* use copyFileSync
@leeroy1821
URL in email broken with Mail Template Layout (joomla#44378)
69e2e1f 
Fix joomla#44377
@obuisard
[Guided Tours] Fix blank screen after a session time out on the steps…
c9057e1 
… page (joomla#44375)
@chmst
Avoid strlen for admin submenu items (joomla#43884)
e3cc332
@alikon
[5.2] fix for Error with trashing items when items are checked out (j…
c0539b1 
…oomla#44392)
@richard67
[5.2] Rename update SQL scripts 5.2.0-2024-09-24.sql to 5.2.1-2024-09…
6808902 
…-24.sql (joomla#44388)
@coolcat-creations
[5.2.] Fix Dark mode in user-captive view - Fix for Issue joomla#43448 (
31640ec 
joomla#44209)
@SniperSister
[5.2] Allow relative URLs in wrapper module and component (joomla#44314)
7e6ac90
@alikon
[5.2] fix for undefined property: $module (joomla#44280)
94bd619
@Hackwar
SEF URLs: Check if SEF plugin is published (joomla#44283)
cc82bbe
@alikon
[5][cypress] mod_articles (joomla#44393)
50a859b 
* 500

* cs

* cs

* cs

* cs

* cs sucks

* bare minimum

* cs
@Hackwar
Changing file permissions
9b13ba2
@Hackwar
Joomla! 5.2.1
ba684a4
@RickR2H
[5.2] atum light mode - Fix modal window link color (joomla#44176)
2f401da 
* Fix dark color scheme link color

* Fix missing curly brace

* Add missing hover color

* Added phpcs:disable Side Effects to prevent drone warning

* Disable drone on the function

* Remove drone comments

* Move function to fix drone errors

* again drone issues

* Made sugested changes to get drone to behave

* Convert indentation from tabs to spaces
@BrainforgeUK
[5.2] Error handling on extension update (joomla#43321)
83333d4 
* Update UpdateModel.php

* Update com_installer.ini

* Update UpdateModel.php

* Update administrator/components/com_installer/src/Model/UpdateModel.php

Co-authored-by: Quy <quy@nomonkeybiz.com>

* Update com_installer.ini

* Update administrator/language/en-GB/com_installer.ini

* Update administrator/language/en-GB/com_installer.ini

* Update administrator/components/com_installer/src/Model/UpdateModel.php

* Update administrator/components/com_installer/src/Model/UpdateModel.php
@drmenzelit
[5.2] Articles Module: Remove unused css + modified container query (j…
d7bc6e9 
…oomla#44327)

* Remove unused css

* Modified container query
@C-Lodder
Fix JS errors in admin menu (joomla#44410)
a79ec96
@Hackwar
Revert to dev
8eddd25
@Hackwar
Merge branch '5.2-dev' of github.com:joomla/joomla-cms into 5.2-dev
f8688d6
@Shivam7-1 @SniperSister
Update debug.es6.js (joomla#44342)
773f7d4 
Co-authored-by: David Jardin <d.jardin@djumla.de>
@Hackwar
Smart Search: Fix URL with highlight query (joomla#43398)
7802043
@Hackwar
Merge branch '5.2-dev' of github.com:joomla/joomla-cms into 5.2-dev
30a64b3
@Kubik-Rubik
[5.2] Add required content filters for the administrator menu (joomla…
ce8b38b 
…#44426)
@HLeithner @QuyTon
Add missing html elements to sanitizer for finder debugging (joomla#4…
73b5d03 
…4422)

Co-authored-by: Quy <quy@nomonkeybiz.com>
@Fedik
[5.2] Fix reCAPTCHA Invisble error getElementsByClassName().forEach i…
97fcd9d 
…s not a function (joomla#44306)
@richard67
[5.2] Fix wrong core files and core folders permissions 777 on update…
63305a4 
… from 5.2.0 or 5.2.1 (joomla#44379)
@richard67
Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-11-11
dc71a36
@richard67 richard67 requested a review from chmst as a code owner November 11, 2024 10:19
@joomla-cms-bot joomla-cms-bot added the Language Change This is for Translators label Nov 11, 2024
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.3-dev labels Nov 11, 2024
@richard67 richard67 removed the request for review from chmst November 11, 2024 10:22
@richard67 richard67 mentioned this pull request Nov 11, 2024
Merged
4 tasks
@richard67 richard67 marked this pull request as draft November 11, 2024 12:45
@richard67
Copy link
Member Author

Changing to draft as the system tests are failing for this PR:

1) Test in frontend that the contact site router
       can process contact without a menu item:

      AssertionError: expected 200 to equal 301
      + expected - actual

      -200
      +301

      at  (webpack://joomla/./tests/System/integration/site/components/com_contact/Router.cy.js:5:35

It seems that the new system tests added to the 5.2-dev branch with PR #44253 need to be adapted to changes in the 5.3-dev branch.

@richard67
Copy link
Member Author

I was able to fix the failing system test by changing the expected result, but I don't know if that is the right change. Will leave this PR in draft mode until clarified.

@richard67 richard67 marked this pull request as ready for review November 13, 2024 12:52
@LadySolveig LadySolveig merged commit 8fe577e into joomla:5.3-dev Nov 13, 2024
3 checks passed
@LadySolveig
Copy link
Contributor

Thank you @richard67

@LadySolveig LadySolveig added this to the Joomla! 5.3.0 milestone Nov 13, 2024
@richard67 richard67 deleted the 5.3-dev-upmerge-2024-11-11 branch November 13, 2024 14:53
@jgerman-bot jgerman-bot mentioned this pull request Nov 14, 2024
Closed
@joomlapl-bot joomlapl-bot mentioned this pull request Nov 14, 2024
Open
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
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.3-dev
Projects
None yet
Milestone
Joomla! 5.3.0
Development

Successfully merging this pull request may close these issues.