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/230919 #41811

Merged
merged 18 commits into from
Sep 19, 2023
Merged

[5.0] upmerge/230919 #41811

merged 18 commits into from
Sep 19, 2023

Conversation

HLeithner
Copy link
Member

retry...

HLeithner and others added 18 commits September 13, 2023 12:17
* [4.3] fix localised cli installation (joomla#41706)

* [4.3] Work around a successful upgrade with silent errors (joomla#41367)

* Log all

* Capture errors

* Log messages

* Error collector

* Error collector

* More error collecting

* More error collecting

* Show errors

* Cli command check errors

* phpcs

* phpcs

* Back button and better text

* phpcs

* logs

* Make sure logging is working before continue

* Apply suggestions from code review

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>

* cs

---------

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
…found error on update to 5 (joomla#41738)

* Add J5 compat plugin to 4.4.0

* Adapt provider.php to latest changes in 5.0-dev

* Add to ExtensionsHelper

* Use protected = 0

* Better XML description.

* Use correct creationDate in XML file

Co-authored-by: Brian Teeman <brian@teeman.net>

---------

Co-authored-by: Brian Teeman <brian@teeman.net>
* Smart Search: Limiting highlighting of tokens

* Update components/com_finder/tmpl/search/default_results.php

Co-authored-by: Quy <quy@nomonkeybiz.com>

* Adding inline help text

---------

Co-authored-by: Quy <quy@nomonkeybiz.com>
Co-authored-by: Olivier Buisard <olivier.buisard@simplifyyourweb.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
build.xml is part of the testing team stuff and the rest I’m removing myself from
* Set the configuration options through a command

* cs
# Conflicts:
#	administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
#	administrator/language/en-GB/plg_behaviour_compat.ini
#	administrator/language/en-GB/plg_behaviour_compat.sys.ini
#	installation/sql/mysql/base.sql
#	installation/sql/postgresql/base.sql
#	language/en-GB/files_joomla.sys.ini
#	plugins/behaviour/compat/compat.xml
#	plugins/behaviour/compat/services/provider.php
#	plugins/behaviour/compat/src/Extension/Compat.php
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev Unit/System Tests labels Sep 19, 2023
@HLeithner HLeithner merged commit 44dbcd4 into joomla:5.0-dev Sep 19, 2023
1 of 3 checks passed
@HLeithner HLeithner deleted the 5.0/upmerge/230919 branch September 19, 2023 14:06
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 NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev Unit/System Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet