Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.1] Upmerges 2024-08-10 #43901

Merged
merged 33 commits into from
Aug 10, 2024
Merged

Conversation

bembelimen
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

bembelimen and others added 30 commits July 4, 2024 18:42
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
* 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>
* [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>
hans2103 and others added 3 commits August 9, 2024 08:31
* 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>
@bembelimen bembelimen requested a review from HLeithner as a code owner August 10, 2024 09:18
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.1-dev Unit/System Tests labels Aug 10, 2024
@bembelimen bembelimen merged commit a130602 into joomla:5.1-dev Aug 10, 2024
3 checks passed
@bembelimen bembelimen added this to the Joomla! 5.1.3 milestone Aug 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NPM Resource Changed This Pull Request can't be tested by Patchtester Unit/System Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.