Skip to content
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

[4.1] Update from 4.0 to 4.1 again #36704

Merged
merged 84 commits into from
Jan 16, 2022

Conversation

bembelimen
Copy link
Contributor

@bembelimen bembelimen commented Jan 16, 2022

Sorry, squashed the commits, next try

brianteeman and others added 30 commits January 1, 2022 20:19
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 <bembelimen@users.noreply.github.com>
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 <quy@fluxbb.org>

Co-authored-by: Quy <quy@fluxbb.org>
* 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 <quy@fluxbb.org>

Co-authored-by: Quy <quy@fluxbb.org>
wilsonge and others added 16 commits January 9, 2022 00:07
# 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 bembelimen added this to the Joomla 4.1.0 milestone Jan 16, 2022
@bembelimen bembelimen merged commit 79d8b8e into joomla:4.1-dev Jan 16, 2022
@bembelimen bembelimen deleted the 4.1/upmerges/2022-01-16 branch January 23, 2024 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet