Merge branch 4.2 into 4.3 #38557
Merged
Merge branch 4.2 into 4.3 #38557
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
) * workaround the a bit off monthsUntilEOS generation * thanks @richard67
Co-authored-by: wilsonge <[email protected]>
Signed-off-by: Roland Dalmulder <[email protected]> Signed-off-by: Roland Dalmulder <[email protected]>
Signed-off-by: Roland Dalmulder <[email protected]>
…a#38442) * add renovate.json to the exclude list * Update build.php * Update build.php
This reverts commit 19a2b79.
This reverts commit 32ef564 Signed-off-by: Roland Dalmulder <[email protected]>
# 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 # composer.json # composer.lock # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/fof/download/adapter/cacert.pem # libraries/src/Http/Transport/cacert.pem # libraries/src/Version.php # libraries/vendor/composer/autoload_files.php # libraries/vendor/composer/autoload_static.php # libraries/vendor/composer/installed.json # libraries/vendor/composer/installed.php # libraries/vendor/paragonie/sodium_compat/src/Compat.php # libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php # libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php # libraries/vendor/paragonie/sodium_compat/src/Core/Util.php # libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php # libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php # libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php # libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php # libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php # libraries/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php # libraries/vendor/paragonie/sodium_compat/src/File.php # plugins/quickicon/eos310/eos310.php
Signed-off-by: Roland Dalmulder <[email protected]>
Signed-off-by: Roland Dalmulder <[email protected]>
* [4.2] hotkeys In the past there were some issues with folders with a . in them. I forget what the issue was. As a result choices.js was stored in choicesjs to avoid this. This pr does the same for hotkeys.js * .
code review This is a redo of joomla#38481
* Gather statistic enabled * Update FinderHelper.php
* Ignore non html requests * Typo
code review This is a redo of joomla#38484
Typo code review this is a redo of joomla#38482
use en-GB spelling this is a redo of joomla#38479
* Change the db calls back to the getDbo * add test
* [4.2] Empty folder Removes the empty folder libraries/vendor/symfony/string/Resources/bin from the distributed release. * speed it up * alpha * richards suggested comment
Co-authored-by: Franciska Perisa <[email protected]>
* manage infinite * no more INF * no more INF * cs * cs * Remove obsolete comment The comment is not applicable anymore
* Add hotkeys.js to files and folders to delete * Add gz file Co-authored-by: Richard Fath <[email protected]> * Change sort of folders Co-authored-by: Richard Fath <[email protected]>
This reverts commit 7ebca92.
Co-authored-by: Franciska Perisa <[email protected]>
* CLI application crashed instantiating MVCFactory Closes joomlagh-38518 * Self-document the --live-site option * Update libraries/src/Application/ConsoleApplication.php Co-authored-by: Richard Fath <[email protected]> * No CLI --live-site uses https://joomla.invalid/set/by/console/application Per joomla#38524 (comment) * Make the example URL HTTPS Per joomla#38524 (review) * Consistent code alignment * Code callisthenics * Code callisthenics, redux * Remove the ternary Co-authored-by: Richard Fath <[email protected]>
# 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 # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php
joomla-cms-bot
added
Composer Dependency Changed
Language Change
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.
Resolved conflicting files
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
installation/language/en-GB/langmetadata.xml
language/en-GB/install.xml
language/en-GB/langmetadata.xml
libraries/src/Version.php