Skip to content

Commit ebf5ce9

Browse files
richard67richard67
committed
Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-10-08
2 parents 0f4dbee + d48372e commit ebf5ce9

Some content is hidden

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

54 files changed

+58
-55
lines changed

‎administrator/components/com_guidedtours/src/Controller/AjaxController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public function fetchUserState()
3737
{
3838
$user = $this->app->getIdentity();
3939

40-
$tourId = $this->app->input->getInt('tid', 0);
41-
$stepNumber = $this->app->input->getInt('sid', 0);
42-
$context = $this->app->input->getString('context', '');
40+
$tourId = $this->app->getInput()->getInt('tid', 0);
41+
$stepNumber = $this->app->getInput()->getInt('sid', 0);
42+
$context = $this->app->getInput()->getString('context', '');
4343

4444
if ($user == null || $user->id <= 0) {
4545
echo new JsonResponse(['success' => false, 'tourId' => $tourId], Text::_('COM_GUIDEDTOURS_USERSTATE_CONNECTEDONLY'), true);

‎build/media_source/templates/administrator/atum/js/template.es6.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@ document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach((button) => {
296296
button.addEventListener('click', () => {
297297
document.querySelectorAll('[data-bs-toggle="collapse"]').forEach((cb) => {
298298
const target = document.querySelector(cb.getAttribute('data-bs-target'));
299+
if (target.contains(button)) {
300+
return;
301+
}
299302
const collapseMenu = bootstrap.Collapse.getInstance(target) || new bootstrap.Collapse(target, {
300303
toggle: false,
301304
});

‎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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</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>

‎installation/language/cy-GB/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>Welsh (United Kingdom)</name>
44
<version>5.2.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</creationDate>
66
<author>Joomla! Project - Welsh 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/da-DK/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>Danish (Danmark)</name>
44
<version>5.2.0</version>
5-
<creationDate>2024-09</creationDate>
5+
<creationDate>2024-10</creationDate>
66
<author>Danish Translation Team (Transl.: Ronny Buelund)</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)