Skip to content

Upmerge from 4.4-dev to 5.2-dev on 2024-09-23#44126

Merged
Hackwar merged 9 commits intojoomla:5.2-devfrom
Hackwar:44-52-upmerge-20240923
Sep 23, 2024
Merged

Upmerge from 4.4-dev to 5.2-dev on 2024-09-23#44126
Hackwar merged 9 commits intojoomla:5.2-devfrom
Hackwar:44-52-upmerge-20240923

Conversation

@Hackwar
Copy link
Member

@Hackwar Hackwar commented Sep 23, 2024

Upmerge from 4.4-dev to 5.2-dev on 2024-09-23

rdeutz and others added 9 commits September 20, 2024 09:26
* fix next exec calculation

* cs fix

* deprecated comment

* not needed any time longer
…oomla#44116)

* When the tour is a category, the authorization to run should come from the extension associated with those categories.

* Improved equality.

Co-authored-by: Brian Teeman <brian@teeman.net>
…4023)

* Check pagination parameters from request

* cs

* only for CMS router

* paramsFromRequest list

---------
* Update .drone.yml

grammar/typo

* Signing .drone.yml

---------

Co-authored-by: Hannes Papenberg <info@joomlager.de>
@Hackwar Hackwar requested a review from rdeutz as a code owner September 23, 2024 09:13
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.2-dev Unit/System Tests labels Sep 23, 2024
@Hackwar Hackwar merged commit 1c95625 into joomla:5.2-dev Sep 23, 2024
@Hackwar Hackwar deleted the 44-52-upmerge-20240923 branch September 23, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NPM Resource Changed This Pull Request can't be tested by Patchtester Unit/System Tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants