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.0] upmerge 2023-11-18 #42360

Merged
merged 12 commits into from Nov 18, 2023
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

Fedik and others added 10 commits November 13, 2023 09:43
* Multiselect update

* Multiselect update

* Multiselect update

* Multiselect update

* Multiselect update

* Update build/media_source/system/js/multiselect.es6.js

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
* move meta declaration

for better upmerge (conflicts joomla#41935)

* same help link element

* check if valid ref

* check if valid elements

* add descText1

* update static error pages

* use early return
* Text::script should update existing script strings

* Text::script should update existing script strings

* comment
…omla#39490)

* Admin Articles View - Transition button fixed

* fixed drone claim

---------
…oomla#41431)

* Make sure that all registry files parsed

* Make sure that all registry files parsed

---------
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev labels Nov 18, 2023
@bembelimen bembelimen added this to the Joomla! 5.0.1 milestone Nov 18, 2023
@bembelimen bembelimen merged commit 9a2e18c into joomla:5.0-dev Nov 18, 2023
3 checks passed
@bembelimen bembelimen deleted the 5.0/upmerge-2023-11-17 branch November 18, 2023 02:55
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 PR-5.0-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants