-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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
Update 4.1 from 4.0 #36690
Merged
bembelimen
merged 77 commits into
joomla:4.1-dev
from
bembelimen:4.1/upmerges/2022-01-14
Jan 15, 2022
Merged
Update 4.1 from 4.0 #36690
bembelimen
merged 77 commits into
joomla:4.1-dev
from
bembelimen:4.1/upmerges/2022-01-14
Jan 15, 2022
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
Many users who use their hosts backup facility and this is typically __only__ for files This update reminds them to backup the database as well
Co-authored-by: Benjamin Trenkle <[email protected]>
…mla#35855 (joomla#36141) * Backport joomla#35855 to 3.10 * one space to much
Fixes a few spaces to tabs issues
* [4.0] media manager breadcrumbs The RTL specific css was wrong as can be seen in the before screenshot This PR removes the RTL specific css (should have been scss) and updates the scss to use logical properties instead. This PR also removes an unused class `breadcrumb-item`. To test RTL you will need to install arabic or persian. and dont forget to npm ci There is no visible change in LTR and the RTL changes are as shown below ## Before LTR ## Before RTL ## After LTR ## After RTL * revert
…36024) This is a replacement to the merged PR joomla#32104 It does exactly the same thing but by using css logical properties we avoid the need to maintain both an LTR and an RTL version[4.0] There is no visual change
Remove extra div that is not needed
replace tab with space code review
All the state icons are grey so that the published icon, which is green, stands out visually. The archived icon however was black. This PR changes that icon to grey. ### Before ### After
* [4.0] Banner Client tips Adds a tooltip to the banner client numbers so that they appear the same as category numbers. Also corrects the class on the trashed number so that it has the correct colour To test Create one banner client Create a banner for the client in each of the published states * Update administrator/components/com_banners/tmpl/clients/default.php oops Co-authored-by: Quy <[email protected]> Co-authored-by: Quy <[email protected]>
* Handle when toggle icon is not available * cs
* Fix Codemirror behind tabs * jscs
* Check model is set before calling its methods * Update OverridesController.php
Currently the article edit form respects return URLs; the category edit form does not. Adding it here makes for a more consistent editing experience.
Updates the plugin to use the new image data used in lazy loading etc. This avoids confusion for users who see different source code for their created articles when compared to the same data plugins To test. Just make sure the sample data still installs and works as expected
…yle declarations being used that mean that we have an array of scripts or stylesheets to be cached and not just a string (joomla#36068) Cache setWorkarounds returns an array not a string
* privacy request logged in only * privacy request logged in only * privacy request logged in only * privacy request logged in only * privacy request logged in only * Update components/com_privacy/controller.php Co-authored-by: Quy <[email protected]> Co-authored-by: Quy <[email protected]>
* [4.0] Joomla Update Silent fails I am not 100% certain that this is the best approach to this. @nikosdion @wilsonge please advise ## The Problem As reported in # if during an update a sql query fails then the updater quits the sql part of the update process and moves on. The joomla_update log gives no indication that there has been a problem etc. ## Proposed Partial Solution Adds a Start SQL and End SQL to the logs If there is an error in the sql then that is written to the logs as well AND it now says End SQL incomplete ### Testing For the testing we will be using the "Update your site by manually uploading the update package." and to make things quick I have prepared an empty update that you should download and use. ### Before Test 1 Update your install and then check the `administrator\logs\joomla_update.php` It should look like ### Before Test 2 Update your database to change the value in the #__schemas table so that the version_id is 4.0.0-2018-5-15 Update your install and then check the `administrator\logs\joomla_update.php` It should look like ### Before Test 3 Update your database to change the value in the #__schemas table so that the version_id is 4.0.3 Update your install and then check the `administrator\logs\joomla_update.php` It should look like ### After - Test 1 Update your database to change the value in the #__schemas table so that the version_id is 4.0.4 Update your install and then check the `administrator\logs\joomla_update.php` It should look like ### After - Test 2 Update your database to change the value in the #__schemas table so that the version_id is 4.0.0-2018-5-15 Update your install and then check the `administrator\logs\joomla_update.php` It should look like ### Before Test 3 Update your database to change the value in the #__schemas table so that the version_id is 4.0.3 Update your install and then check the `administrator\logs\joomla_update.php` It should look like
…ges/2022-01-14 # Conflicts: # .drone.yml # 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/components/com_categories/src/Controller/CategoriesController.php # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # composer.lock # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # layouts/joomla/content/category_default.php # libraries/src/Application/ConsoleApplication.php # libraries/src/Version.php # tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php
bembelimen
requested review from
chmst,
rdeutz,
wilsonge and
zero-24
as code owners
January 14, 2022 22:03
joomla-cms-bot
added
Composer Dependency Changed
Language Change
This is for Translators
PR-4.1-dev
Unit/System Tests
labels
Jan 14, 2022
bembelimen
added a commit
that referenced
this pull request
Jan 16, 2022
This reverts commit 989c719.
bembelimen
added a commit
that referenced
this pull request
Jan 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Pull Request for Issue # .
Summary of Changes
Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Documentation Changes Required