[6.1] Upmerge 2026-02-18 - #46916
Merged
HLeithner merged 18 commits intoFeb 19, 2026
Merged
Conversation
* Update create-translation-pull-request-v6.yml * Language update * Use PAT for translation bot * Language update * fix build error https://github.com/joomla-translation-bot/joomla-cms/actions/runs/20963499191/job/60247089852 * Language update * Update joomla.cli.ini * Delete installation/language/en-US/joomla.cli.ini * add en-us joomla.cli.ini * Language update
Merge pull request joomla#46911 from richard67/6.0-dev-upmerge-2026-02-18
There was a problem hiding this comment.
Pull request overview
Upmerges changes from 6.0-dev into the 6.1 line, primarily updating metadata/baselines and incorporating a few behavioral tweaks in the admin articles list and TinyMCE integration.
Changes:
- Adjusts TinyMCE iframe reload handling logic to better account for differing browser init/load sequencing.
- Updates various metadata files (language
creationDate, test@sincetags) and refreshes the PHPStan baseline counts. - Adds Cassiopeia SCSS overrides for calendar field button CSS variables and refines workflow transition attribute rendering in the articles list.
Reviewed changes
Copilot reviewed 65 out of 65 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/Unit/Libraries/Cms/Form/Rule/UrlRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/OptionsRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/NumberRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/ModuleLayoutRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/CssIdentifierRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/ColorRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/CalendarRuleTest.php | Updates @since annotations. |
| tests/Unit/Libraries/Cms/Form/Rule/BooleanRuleTest.php | Updates @since annotations. |
| phpstan-baseline.neon | Updates baseline counts for deprecated-method identifiers. |
| installation/language/zh-TW/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/zh-CN/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/vi-VN/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ur-PK/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/uk-UA/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/tr-TR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/th-TH/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ta-IN/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/sv-SE/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/sr-YU/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/sl-SI/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/sk-SK/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ro-RO/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/pt-PT/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/pt-BR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/nl-NL/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/nl-BE/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/mk-MK/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/lv-LV/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/lt-LT/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ko-KR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/kk-KZ/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ka-GE/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ja-JP/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/it-IT/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/id-ID/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/hu-HU/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/hr-HR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/he-IL/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/fr-FR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/fr-CA/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/fi-FI/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/fa-IR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/fa-AF/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/eu-ES/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/et-EE/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/es-ES/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/en-US/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/en-NZ/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/en-CA/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/en-AU/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/el-GR/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/da-DK/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/cy-GB/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/cs-CZ/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ca-ES/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/bg-BG/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/be-BY/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/ar-AA/langmetadata.xml | Bumps creationDate to 2026-02. |
| installation/language/af-ZA/langmetadata.xml | Bumps creationDate to 2026-02. |
| build/media_source/templates/site/cassiopeia/scss/system/fields/calendar.scss | Adds calendar field styling overrides (CSS var tweaks) and imports base calendar CSS. |
| build/media_source/plg_editors_tinymce/js/tinymce.es6.js | Changes iframe init/load coordination to register reload re-init listener more reliably. |
| administrator/components/com_content/tmpl/articles/default.php | Only computes workflow transition options/attributes when workflows are enabled; avoids emitting empty data-transitions. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
richard67
approved these changes
Feb 18, 2026
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
May 25, 2026
joomla/joomla-cms#46278 + joomla/joomla-cms#46277 + joomla/joomla-cms#46514 + joomla/joomla-cms#46375 + joomla/joomla-cms#46605 + joomla/joomla-cms#42347 + joomla/joomla-cms#47438 + (upmerge) joomla/joomla-cms#47542 + (upmerge) joomla/joomla-cms#47552 - (только для др. языков) joomla/joomla-cms#47499 - (только для en-GB) joomla/joomla-cms#47537 - (только для др. языков) joomla/joomla-cms#47229 + joomla/joomla-cms#47371 - (только для др. языков) joomla/joomla-cms#47356 + joomla/joomla-cms#47341 + joomla/joomla-cms#47290 + joomla/joomla-cms#45988 + joomla/joomla-cms#47281 - (только для др. языков) joomla/joomla-cms#47234 + joomla/joomla-cms#46438 + joomla/joomla-cms#46916 - (только для др. языков) joomla/joomla-cms#46884 + joomla/joomla-cms#46883 + joomla/joomla-cms#41927 - (только для др. языков) joomla/joomla-cms#46421 + joomla/joomla-cms#46539 + joomla/joomla-cms#46882 + joomla/joomla-cms#46786 + joomla/joomla-cms#45013 + joomla/joomla-cms#46501 + joomla/joomla-cms#46559 + joomla/joomla-cms#46820 + joomla/joomla-cms#46778 + (upmerge) joomla/joomla-cms#45990 + joomla/joomla-cms#46671 +
This file contains hidden or 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
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.
Upmerges from 6.0-dev