[5.0] Upmerge from 4.4-dev as of today, May 21, 2023 #40640
Merged
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
* plugin attribute * plugin attribute
…or the Input Checkboxes (Error in Guided Tours joomla#40054) (joomla#40090)
* [4.3] fix indention plugin xml * remove version node
* Use HelperFactory to get Helper for mod_quickicon * Fix typo --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* [4.3] Workflow code comment The code comments here do not make sense. I have attempted to correct that but I am not 1000% certain I have understood it correctly. There is no point in having a comment in the code if it doesn't make sense cc @laoneo * Update libraries/src/MVC/Model/WorkflowBehaviorTrait.php Co-authored-by: Harald Leithner <leithner@itronic.at> --------- Co-authored-by: Harald Leithner <leithner@itronic.at>
simple typo correction ### Link to documentations Please select: - [ ] Documentation link for docs.joomla.org: <link> - [x] No documentation changes for docs.joomla.org needed - [ ] Pull Request link for manual.joomla.org: <link> - [x] No documentation changes for manual.joomla.org needed
simple spelling correction
* added a test for smart search * updates
* added a test for create article * updates * Update Article.cy.js * add test for edit article without menu item --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Move to user factory aware trait * no need for interfaces ---------
) * added a test for contact categories with menu item * Update tests/System/integration/site/components/com_contact/Categories.cy.js * Update tests/System/integration/site/components/com_contact/Categories.cy.js * Update Categories.cy.js --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* added a test for categories view of articles * added a empty line at last * Update tests/System/integration/site/components/com_content/Categories.cy.js Co-authored-by: Brian Teeman <brian@teeman.net> * Update Categories.cy.js * add test with menu item * updates * Update Categories.cy.js --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> Co-authored-by: Brian Teeman <brian@teeman.net>
* Add tests for global configuration and support mail tests * cs * wait till tab is visible * visible * mailer visible * Update tests/System/plugins/mail.js Co-authored-by: Brian Teeman <brian@teeman.net> * Setup mailing in installation task * Doc * Add more mail checks * Do not log the mails as it screwes up the drone output log --------- Co-authored-by: Brian Teeman <brian@teeman.net>
* added test for archived articles * Update Archived.cy.js * Update tests/System/integration/site/components/com_content/Archived.cy.js * Update Archived.cy.js --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Test added for tags listview * conding standard corrected * standard fix * standard fix
…ion (joomla#40566) * add create request to export test * add create request to remove test * improve code style * improve code style * php test1 * enable send mail in the backend * resolving js style issues and adding test for the remove type also * should -> check * sending test mail and confirm information req. * save & close * remove empty line * remove config code * clear mails * Update request.cy.js * adding test for second mail(match token) * simplify * Rename request.cy.js to Request.cy.js * add a second test with a menu item * add comment * add sender * delete prev. reqs. * js cs * add test for remove * removeeee
richard67
requested review from
bembelimen,
HLeithner,
zero-24,
rdeutz and
wilsonge
as code owners
joomla-cms-bot
added
NPM Resource Changed
|
Thx |
|
Welcome. |
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.
Pull Request for Issue # .
Summary of Changes
Upmerge from 4.4-dev into 5.0-dev as of today with conflicts resolved plus update of deleted files in script.php by the new 4.3.2 update SQL script.
@HLeithner I've done this for testing purpose but it is ok, so if you want, use it for the upmerge to save you some time.
If you don't wanna use it because you want to have full control on everything, I'd understand that. But then you can at least use the branch of this PR to cross-check your result.