Skip to content

Commit 457e5f4

Browse files
richard67richard67
committed
Merge remote-tracking branch 'upstream/5.2-dev' into 5.3-dev-upmerge-2025-02-28
2 parents 8a17a99 + 2e81829 commit 457e5f4

File tree

62 files changed

+115
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+115
-112
lines changed

‎administrator/components/com_banners/src/Table/BannerTable.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public function __construct(DatabaseDriver $db, ?DispatcherInterface $dispatcher
5757

5858
$this->created = Factory::getDate()->toSql();
5959
$this->setColumnAlias('published', 'state');
60+
$this->setColumnAlias('title', 'name');
6061
}
6162

6263
/**

‎build/media_source/com_media/scss/components/_media-breadcrumb.scss‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
a {
3535
color: var(--body-color);
3636
}
37-
&::before,
3837
&::after {
39-
border: none;
38+
border-inline-start-color: $breadcrumbs-current-bg;
4039
}
4140
}
4241
&:hover {
@@ -62,7 +61,7 @@
6261
border-inline-start: 10px solid transparent;
6362
}
6463
&::before {
65-
border-inline-start-color: $border-color;
64+
border-inline-start-color: var(--gray-400);
6665
}
6766
&::after {
6867
border-inline-start-color: $breadcrumbs-bg;

‎build/media_source/vendor/bootstrap/js/carousel.es6.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,12 @@ window.bootstrap = window.bootstrap || {};
44
window.bootstrap.Carousel = Carousel;
55

66
if (Joomla && Joomla.getOptions) {
7-
// Get the elements/configurations from the PHP
7+
// Get the elements configuration from PHP
88
const carousels = Joomla.getOptions('bootstrap.carousel');
9-
// Initialise the elements
9+
1010
if (typeof carousels === 'object' && carousels !== null) {
1111
Object.keys(carousels).forEach((carousel) => {
12-
const opt = carousels[carousel];
13-
const options = {
14-
interval: opt.interval ? opt.interval : 5000,
15-
keyboard: opt.keyboard ? opt.keyboard : true,
16-
pause: opt.pause ? opt.pause : 'hover',
17-
slide: opt.slide ? opt.slide : false,
18-
wrap: opt.wrap ? opt.wrap : true,
19-
touch: opt.touch ? opt.touch : true,
20-
};
21-
12+
const options = carousels[carousel];
2213
const elements = Array.from(document.querySelectorAll(carousel));
2314
if (elements.length) {
2415
elements.map((el) => new window.bootstrap.Carousel(el, options));

‎components/com_contact/forms/contact.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
type="checkbox"
5959
label="COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL"
6060
id="contact-email-copy"
61-
default="0"
6261
/>
6362
</fieldset>
6463

‎installation/language/af-ZA/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Afrikaans (Suid-Afrika)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Afrikaans Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ar-AA/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Arabic (اللغة العربية)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Dr. Ashraf Damra</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/be-BY/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Belarusian (Belarus)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Joomla Belarus Community</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/bg-BG/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Bulgarian (bg-BG)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Joomla! Bulgaria</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ca-ES/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Catalan (ca-ES)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Catalan [ca-ES] Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/cs-CZ/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Czech (Čeština)</name>
44
<version>5.2.4</version>
5-
<creationDate>2025-01</creationDate>
5+
<creationDate>2025-02</creationDate>
66
<author>Czech Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)