Merge branch 4.2 into 4.3 by obuisard · Pull Request #38557 · joomla/joomla-cms

obuisard · 2022-08-23T00:14:11Z

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

@richard67

) * workaround the a bit off monthsUntilEOS generation * thanks @richard67

Co-authored-by: wilsonge <wilsonge@users.noreply.github.com>

Signed-off-by: Roland Dalmulder <contact@rolandd.com> Signed-off-by: Roland Dalmulder <contact@rolandd.com>

Signed-off-by: Roland Dalmulder <contact@rolandd.com>

…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 <contact@rolandd.com>

# 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 <contact@rolandd.com>

* [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

…oomla#38488) Close joomla#38485

* 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 <franciska.perisa@bcmsolutions.de>

* manage infinite * no more INF * no more INF * cs * cs * Remove obsolete comment The comment is not applicable anymore

Closes joomlagh-38483

* Add hotkeys.js to files and folders to delete * Add gz file Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Change sort of folders Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

This reverts commit 7ebca92.

Replaces joomlagh-38491

Co-authored-by: Franciska Perisa <9084265+fancyFranci@users.noreply.github.com>

* 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 <richard67@users.noreply.github.com> * 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 <richard67@users.noreply.github.com>

# 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

zero-24 and others added 30 commits June 18, 2022 17:36

Joomla! 3.10.10 Stable

715e3a5

reset to dev

8f95855

[3.10] Workaround the a bit off monthsUntilEOS calculation (joomla#38317

f4a39fc

) * workaround the a bit off monthsUntilEOS generation * thanks @richard67

Update CA cert file (joomla#38361)

4530a28

Co-authored-by: wilsonge <wilsonge@users.noreply.github.com>

Upgrading paragonie/sodium_compat (v1.17.0 => v1.17.1) (joomla#38387)

b2b127c

Joomla! 3.10.11 Release Candidate 1

164d39d

reset to dev

cefa029

Fix empty default_value check in fields plugin (joomla#38426)

19a2b79

Set a default for events to email (joomla#38439)

0110c04

Signed-off-by: Roland Dalmulder <contact@rolandd.com> Signed-off-by: Roland Dalmulder <contact@rolandd.com>

Allow the statistics plugin to run on the captive page (joomla#38436)

819f18b

Signed-off-by: Roland Dalmulder <contact@rolandd.com>

[4.2] add renovate.json to the exclude list on the build tools (jooml…

7c1eb41

…a#38442) * add renovate.json to the exclude list * Update build.php * Update build.php

Revert "Fix empty default_value check in fields plugin (joomla#38426)"

7ef0a62

This reverts commit 19a2b79.

Revert "[4.2] Menu item custom field (joomla#38244)"

31a2677

This reverts commit 32ef564 Signed-off-by: Roland Dalmulder <contact@rolandd.com>

Sodium compat update 1.17.1

3fc3cf8

Signed-off-by: Roland Dalmulder <contact@rolandd.com>

Sodium compat update 1.17.1

c375611

Signed-off-by: Roland Dalmulder <contact@rolandd.com>

[4.2] hotkeys (joomla#38334)

ab6d2f8

* [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 * .

Joomla! 4.2.0 Stable

526934f

Reset to dev

937df36

[4.2] s/TJoomla/Joomla (joomla#38493)

3c2d802

code review This is a redo of joomla#38481

Make sure the itemID is of type int (joomla#38504)

13d752e

Add bcmath_compat polyfill for servers without BCmath / GMP support (j…

337b389

…oomla#38488) Close joomla#38485

[4][com_finder] error when gather statistic enabled (joomla#38373)

4fa4101

* Gather statistic enabled * Update FinderHelper.php

MFA: ignore non html requests (joomla#38492)

7ebca92

* Ignore non html requests * Typo

[4.2] remove php open close tags (joomla#38495)

5b048df

code review This is a redo of joomla#38484

[4.2] s/validatng/validating (joomla#38494)

1107a88

Typo code review this is a redo of joomla#38482

[4.2] s/favorite/favourite (joomla#38496)

196c9e5

use en-GB spelling this is a redo of joomla#38479

[4.2] Change the db calls back to the getDbo (joomla#38506)

1ce74dc

* Change the db calls back to the getDbo * add test

[4.2] Empty folder (joomla#38516)

ec2009e

* [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

Always check updateCheck before using it (joomla#38519)

147911f

Co-authored-by: Franciska Perisa <franciska.perisa@bcmsolutions.de>

alikon and others added 13 commits August 18, 2022 20:48

[4.2] Redis cache (joomla#38490)

d6357ce

* manage infinite * no more INF * no more INF * cs * cs * Remove obsolete comment The comment is not applicable anymore

Remove unused imports in MFA (joomla#38498)

1f99d81

Closes joomlagh-38483

[4.2] Remove hotkeys.js by script.php (joomla#38523)

152ebcc

* Add hotkeys.js to files and folders to delete * Add gz file Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Change sort of folders Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

Revert "MFA: ignore non html requests (joomla#38492)" (joomla#38529)

19f68b2

This reverts commit 7ebca92.

Remove the autoload_psr4 before running finalisation.php (joomla#38525)

30ab12a

Replaces joomlagh-38491

Joomla! 4.2.1 Release Candidate 1

26b38b5

Reset to dev

6fde173

[4.2 RC1] Feed display module not working (joomla#38312)

aa1f62a

Stats collection must not be shown in captive MFA pages (joomla#38533)

63f9f9c

Co-authored-by: Franciska Perisa <9084265+fancyFranci@users.noreply.github.com>

Joomla! 4.2.1 Release Candidate 2

79db83a

Reset to dev

9a1309c

obuisard requested review from rdeutz, wilsonge and zero-24 as code owners August 23, 2022 00:14

joomla-cms-bot added Composer Dependency Changed Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.3-dev labels Aug 23, 2022

obuisard changed the title ~~Up merge 4.2 into 4.3~~ Merge branch 4.2 into 4.3 Aug 23, 2022

obuisard merged commit b965a07 into joomla:4.3-dev Aug 23, 2022

rdeutz added this to the Joomla! 4.3.0 milestone Oct 22, 2022

heelc29 mentioned this pull request Nov 20, 2022

[4.3] Redis cache PR #38490 for 4.3 branch #39261

Merged

obuisard deleted the upmerge-2022-08-22 branch September 15, 2023 18:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge branch 4.2 into 4.3#38557

Merge branch 4.2 into 4.3#38557
obuisard merged 43 commits intojoomla:4.3-devfrom
obuisard:upmerge-2022-08-22

obuisard commented Aug 23, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Conversation

obuisard commented Aug 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

obuisard commented Aug 23, 2022 •

edited

Loading