Skip to content

5.1 to 5.2 upmerge 2024-08-28#43993

Merged
Hackwar merged 23 commits intojoomla:5.2-devfrom
Hackwar:51-52-upmerge-20240828
Aug 28, 2024
Merged

5.1 to 5.2 upmerge 2024-08-28#43993
Hackwar merged 23 commits intojoomla:5.2-devfrom
Hackwar:51-52-upmerge-20240828

Conversation

@Hackwar
Copy link
Member

@Hackwar Hackwar commented Aug 28, 2024

Upmerge from 5.1 to 5.2 on 2024-08-28

MacJoom and others added 23 commits August 22, 2024 20:25
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* consider missing parameters and read input from get

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

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* revert get change

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* Language update

* Language update

* Language update

* Language update

* Update create-translation-pull-request-v4.yml

Rename the job to find it faster in actions

* Language update

---------

Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-authored-by: Quy <quy@nomonkeybiz.com>
…dmin and don't escape custom email fields (joomla#43981)

* Escape also copy to sender in contact form email

* Escape also new user notification email to admins

* Remove customfields from unsafe tags
# Conflicts:
#	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
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
#	package-lock.json
#	package.json
@Hackwar Hackwar requested a review from HLeithner as a code owner August 28, 2024 18:29
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-5.2-dev labels Aug 28, 2024
@Hackwar Hackwar merged commit 88bf334 into joomla:5.2-dev Aug 28, 2024
@Hackwar Hackwar deleted the 51-52-upmerge-20240828 branch August 28, 2024 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Language Change This is for Translators

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants