Skip to content

Comments

[5.0] Upmerge#41584

Merged
HLeithner merged 37 commits intojoomla:5.0-devfrom
Digital-Peak:upmerge
Sep 4, 2023
Merged

[5.0] Upmerge#41584
HLeithner merged 37 commits intojoomla:5.0-devfrom
Digital-Peak:upmerge

Conversation

@laoneo
Copy link
Member

@laoneo laoneo commented Sep 4, 2023

Upmerge from 4.4.

Magnus Singer and others added 30 commits August 28, 2023 12:30
Co-authored-by: Quy <quy@nomonkeybiz.com>
…ters (joomla#41470)

* Fix taxonomy filter options

* refactor rest of query to prepared statements

---------

Co-authored-by: Quy <quy@nomonkeybiz.com>
…sult directly (joomla#41525)

* Backward compatibility handling for plugins that setting the result directly.

* Update libraries/src/Event/AbstractImmutableEvent.php

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

---------
* Tests for com_privacy consent on user site

* Allow ability to enable extension in tests to prevent errors

* remove paramater not needed

* Added fixes to stop  errors in drone build

* Added fixes to stop  errors in drone build

* Added fixes to stop  errors in drone build
* system test for com_installer

* cs
* Update Categories.cy.js

* Update Categories.cy.js

* Update Categories.cy.js

* Update Categories.cy.js

* Update Categories.cy.js

* Update Categories.cy.js

added spaces and semicolons

* Update Categories.cy.js

Missing spaces and semicolons

* Update Categories.cy.js

Missing spaces and semicolons

* Update Categories.cy.js

Missing spaces and semicolons

* Update Categories.cy.js

removed tabs

* Update Categories.cy.js

Removed tabs

* Update Categories.cy.js

Removed tabs

* Update Categories.cy.js

Removed tabs
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
@laoneo laoneo changed the base branch from 4.3-dev to 5.0-dev September 4, 2023 12:31
@laoneo laoneo changed the title Upmerge [5.0] Upmerge Sep 4, 2023
@joomla-cms-bot joomla-cms-bot added Composer Dependency Changed NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev labels Sep 4, 2023
@laoneo laoneo removed the PR-4.3-dev label Sep 4, 2023
@HLeithner HLeithner merged commit 3fe66e6 into joomla:5.0-dev Sep 4, 2023
HLeithner added a commit that referenced this pull request Sep 4, 2023
HLeithner added a commit that referenced this pull request Sep 4, 2023
@HLeithner HLeithner deleted the upmerge branch September 4, 2023 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Composer Dependency Changed 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.