5.1 to 5.2 upmerge 20240817 #43937
Merged
5.1 to 5.2 upmerge 20240817 #43937
Conversation
This file contains 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>
* Fix display of total votes * phpcs * cs
With the joomla#43702 ESM documentation update, the small problem has arisen that `npx` uses `cypress.config.js` in error messages, although `cypress.config.mjs` is used. This was 'fixed' in using `npm`. Unfortunately, it turned out that: * npx cypress run --spec is not replaceable by: * npm run cypress:run --spec therefore changed back. A short note has been added to the Troubleshooting section. It was also discovered that the environment variable in the `sudo` call was set in the wrong order, which has been corrected. Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Obvious typo using a number instead of a letter
* Don't execute max system tests on pr commits * Signature * Run php max on postgres
* iife * fixes * globals ---------
* Fix missing quoteName in FieldLayoutField * remove empty space * Update administrator/components/com_fields/src/Field/FieldLayoutField.php
* Fix com_content articles batch modal button logic * remove check completly ---------
* [4.4] fixing typo removal double "as" * replace ' as as ' by ' as '
joomla#43789) * Fix SQL field, get the filter value from the linked filter field * cs * esc ---------
as down-merge from 5.1-dev Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Language update * Language update * Language update * Language update * Update create-translation-pull-request-v5.yml for 5.1 * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update * Language update --------- Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com> Co-authored-by: Harald Leithner <leithner@itronic.at> Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de> Co-authored-by: Martina Scholz <64533137+LadySolveig@users.noreply.github.com>
* [cypress] Updated to joomla-cypress 1.1.0 The joomla-cypress NPM package used has been updated to the latest version in order to be able to use one version in all active joomla-cms branches. Other packages were also updated to the latest versions with the `npm update`. The overwritten Cypress commands for faster login with session have been deleted, as they are already included in the new joomla-cypress version. * Hack to prevent deprecated in mod_related_items * 3 more files with workarounds * no hack for modules * avoid hacks * avoid hacks * featured * featured * module * nomore * nomore * Fix missing apostrophe * NPM Update only joomla-cypress npm install joomla-cypress@1.1.0 * Update tests/System/README.md Removed notice on overridden joomla-cypress commands * Fixing lint:testjs errors * Undo the changes extracted to a separate PRs * npm update joomla-cypress 1.1.1 --------- Co-authored-by: Nicola Galgano <optimus4joomla@gmail.com> Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* make sure you click on the button, not any of the children * close collapse when click to open a dropdown * fix lint:js issues * Update build/media_source/templates/administrator/atum/js/template.es6.js Co-authored-by: Brian Teeman <brian@teeman.net> --------- Co-authored-by: Brian Teeman <brian@teeman.net>
…#43198) * Form Text Field: Translate text for frontend validation * Update text.php --------- Co-authored-by: Quy <quy@nomonkeybiz.com>
…o buttons in subforms (joomla#43804)
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
joomla-cms-bot
added
Language Change
# 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 # build/media_source/system/js/core.es6.js # 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
Sep 19, 2024
joomla/joomla-cms#43232 + joomla/joomla-cms#43378 + joomla/joomla-cms#43216 + joomla/joomla-cms#43260 + joomla/joomla-cms#43386 + joomla/joomla-cms#43575 + joomla/joomla-cms#43491 + joomla/joomla-cms#43760 - (upmerge, внесено в 5.1х) joomla/joomla-cms#43247 + joomla/joomla-cms#43579 + joomla/joomla-cms#43690 + joomla/joomla-cms#43829 + joomla/joomla-cms#43840 + joomla/joomla-cms#43841 + joomla/joomla-cms#43885 - (upmerge, только для др. пакетов) joomla/joomla-cms#43223 + joomla/joomla-cms#43810 - (только для en-GB) joomla/joomla-cms#43898 + joomla/joomla-cms#43432 + joomla/joomla-cms#43870 + joomla/joomla-cms#42850 + joomla/joomla-cms#43937 - (upmerge, только для др. пакетов) joomla/joomla-cms#43862 + joomla/joomla-cms#43975 + joomla/joomla-cms#43910 + joomla/joomla-cms#43965 + joomla/joomla-cms#43738 + joomla/joomla-cms#43814 + joomla/joomla-cms#44000 + joomla/joomla-cms#44050 + (upmerge, с 4.4.9) joomla/joomla-cms#43966 + joomla/joomla-cms#44065 +
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an upmerge from 5.1 to 5.2.