Skip to content

Upmerge 5.1-dev to 5.2-dev 2024-08-22#43964

Merged
Hackwar merged 11 commits intojoomla:5.2-devfrom
Hackwar:5.1-5.2-upmerge-2024-08-22
Aug 22, 2024
Merged

Upmerge 5.1-dev to 5.2-dev 2024-08-22#43964
Hackwar merged 11 commits intojoomla:5.2-devfrom
Hackwar:5.1-5.2-upmerge-2024-08-22

Conversation

@Hackwar
Copy link
Member

@Hackwar Hackwar commented Aug 22, 2024

No description provided.

bembelimen and others added 11 commits August 18, 2024 13:24
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
…joomla#43953)

* fix com_finder pagination

* Codestyle

* cs fix

* Update components/com_finder/src/View/Search/HtmlView.php

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

* Append missing catid parameter in archive view

* also cover title search

* add additional parameters from PR joomla#43954

* update ID filter

* PHPCS

---------

Co-authored-by: Hannes Papenberg <info@joomlager.de>
Co-authored-by: Quy <quy@nomonkeybiz.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
# Conflicts:
#	administrator/components/com_admin/script.php
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	composer.json
#	composer.lock
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Mail/MailTemplate.php
#	libraries/src/Pagination/Pagination.php
#	libraries/src/Version.php
#	package-lock.json
#	package.json
@joomla-cms-bot
Copy link

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.

@Hackwar Hackwar enabled auto-merge August 22, 2024 16:08
@Hackwar Hackwar merged commit 76a2903 into joomla:5.2-dev Aug 22, 2024
@Hackwar Hackwar deleted the 5.1-5.2-upmerge-2024-08-22 branch November 24, 2024 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants