Skip to content

[5.3] Upmerges 2024-11-13#44448

Merged
bembelimen merged 9 commits intojoomla:5.3-devfrom
LadySolveig:5.3/upmerge/2024-11-13
Nov 13, 2024
Merged

[5.3] Upmerges 2024-11-13#44448
bembelimen merged 9 commits intojoomla:5.3-devfrom
LadySolveig:5.3/upmerge/2024-11-13

Conversation

@LadySolveig
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

pAnd0rASBG and others added 9 commits November 12, 2024 07:49
* Removed hardcoded username from Actionlogs.cy.js

On line joomla#22 "ci-admin" was hardcoded, causing the test to fail, if another user is configured in cypress.config.mjs

* Changed Syntax to use Template Literals

Using Template Literals to pass JS linting

* Update tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js

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

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
@LadySolveig LadySolveig changed the base branch from 5.2-dev to 5.3-dev November 13, 2024 17:00
@bembelimen bembelimen enabled auto-merge November 13, 2024 17:21
@bembelimen bembelimen merged commit 3d15c07 into joomla:5.3-dev Nov 13, 2024
@rdeutz rdeutz added this to the Joomla! 5.3.0 milestone Dec 24, 2024
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 - (только для др. пакетов)
@LadySolveig LadySolveig deleted the 5.3/upmerge/2024-11-13 branch June 5, 2025 09:03
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.