5.2 to 5.3 upmerge 2024-08-28 #43994
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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>
* Refactor all occurences of File to use framework * Refactoring some error handling * Codestyle * Fix error handling * Fix FormattedtextLogger.php * Chaining exceptions
…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
attachement => attachment code review only Signed-off-by: BrianTeeman <brian@teeman.net> Co-authored-by: Quy <quy@nomonkeybiz.com>
# 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
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Apr 14, 2025
joomla/joomla-cms#41496 - (upmerge с 5.2х) joomla/joomla-cms#42530 + joomla/joomla-cms#43994 - (upmerge с 5.2х) joomla/joomla-cms#44009 - (upmerge с 5.2х) joomla/joomla-cms#44010 - (upmerge с 5.2х) joomla/joomla-cms#44161 + joomla/joomla-cms#44187 - (upmerge с 5.2х) joomla/joomla-cms#44207 - (upmerge с 5.2х) joomla/joomla-cms#44271 + joomla/joomla-cms#44273 + joomla/joomla-cms#44288 - (только для en-GB) joomla/joomla-cms#44348 - (upmerge с 5.2х) joomla/joomla-cms#44366 + joomla/joomla-cms#44367 - (upmerge с 5.2х) joomla/joomla-cms#44434 - (upmerge с 5.2х) joomla/joomla-cms#44448 - (upmerge с 5.2х) joomla/joomla-cms#44462 + joomla/joomla-cms#44487 - (upmerge с 5.2х) joomla/joomla-cms#44587 + joomla/joomla-cms#44600 + joomla/joomla-cms#44604 + joomla/joomla-cms#44621 - (upmerge с 5.2х) joomla/joomla-cms#44623 + joomla/joomla-cms#44632 + joomla/joomla-cms#44640 - (позже был REVERT joomla/joomla-cms#44845) joomla/joomla-cms#44714 - (upmerge с 5.2х) joomla/joomla-cms#44756 + joomla/joomla-cms#44768 - (upmerge с 5.2х) joomla/joomla-cms#44792 - (только для en-GB) joomla/joomla-cms#44813 + joomla/joomla-cms#44822 - (upmerge с 5.2х) joomla/joomla-cms#44839 + joomla/joomla-cms#44871 + joomla/joomla-cms#44954 + joomla/joomla-cms#45034 - (upmerge с 5.2х) joomla/joomla-cms#45058 - (только для en-GB) joomla/joomla-cms#45064 + joomla/joomla-cms#45078 - (только для en-GB) joomla/joomla-cms#45130 - (upmerge с 5.2х) joomla/joomla-cms#45240 - (upmerge с 5.2х) joomla/joomla-cms#45246 - (только для др. пакетов)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
5.2 to 5.3 upmerge 2024-08-28