[6.1] Upmerge 2025-10-14 #46285
Merged
[6.1] Upmerge 2025-10-14 #46285
+329
−106
Conversation
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
* Custom field fix * revert change to let it fail * added suggestion from cyrez
* Update create-translation-pull-request-v6.yml * Language updates
* Updated the forum link for j6
* [6.0] Point to J6 translations list * rename * return empty array instead of null otherwise foreach loop in api endpoint fails * test should pass if no languages found eg if not yet set up
* Create tada.txt * Delete build/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg * Add files via upload * Delete build/media_source/com_guidedtours/images/6_0/tada.txt * Add new image file * Rename cassiopeiacolors.jpg to cassiopeiacolors_old.jpg * Image with new size * Delete build/media_source/com_guidedtours/images/6_0/cassiopeiacolors_old.jpg
… tag name instead of the tag id (joomla#46174) * update sql * [CMS PR 46174] Update the update SQL scripts and for new installations supports.sql (joomla#21) * Names quotes for column names * Remove some tabs * Use separate lines for closing brackets * Fix SQL error "operator does not exist" * Append only once to array * Update supports.sql for new installations
* Remove wrong unique constraint from "#__ucm_content" table on PostgreSQL * Rename 6.0.0-2025-10-11.sql to 6.0.0-2025-10-12.sql * Rename 6.0.0-2025-10-12.sql to 6.0.0-2025-10-10.sql
* Fix version history * CS * Fix hardcoded table name * Add field for new installation * Update administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-11.sql * Update administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-10-11.sql Co-authored-by: Richard Fath <[email protected]> * Prevent data lost when restore from version history created prior to Joomla 6 * Update administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-11.sql Co-authored-by: Richard Fath <[email protected]> * Add field for new installation * Make phpstan happy * Update libraries/src/Versioning/VersionableModelTrait.php Co-authored-by: Christian Heel <[email protected]> * Only store item real data into history * Revert "Only store item real data into history" * Avoid random column could not be null when restore from version history * Mark the history record not created by VersionableModelTrait as legacy * Fix warning for subform fields on compare view * Code simplify, thanks Richard * Move merge data logic to trait to make it easier for third party integration if not call parent::save * Use new way for saving category version history * Use new way to store version history for Tags * Prevent Version plugin save history for for Content, Banner, Contact * Use right context for category * Fix current version not detected properly on history view
joomla-cms-bot
added
Language Change
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
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.
Upmerge from 6.0