mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-06-25 23:02:55 +00:00
Merge branch '4.1-dev' into 4.2-dev
# Conflicts: # administrator/manifests/files/joomla.xml # libraries/src/Version.php # plugins/twofactorauth/totp/tmpl/form.php
This commit is contained in:
Roland Dalmulder
commit
92464c7b97
|
|
@ -85,7 +85,7 @@ $wa->useScript('multiselect')
|
|||
<span class="icon-lock" aria-hidden="true"></span>
|
||||
</button>
|
||||
<?php else : ?>
|
||||
<button type="buttton" class="btn btn-secondary btn-sm" onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
|
||||
<button type="button" class="btn btn-secondary btn-sm" onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
|
||||
<?php echo Text::_('JNO'); ?>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
xsi:schemaLocation="urn:joomla.org menu.xsd"
|
||||
>
|
||||
<menuitem
|
||||
type="component"
|
||||
title="MOD_MENU_CONTROL_PANEL"
|
||||
link="index.php"
|
||||
type="component"
|
||||
element="com_cpanel"
|
||||
link="index.php?option=com_cpanel&view=cpanel"
|
||||
class="class:home"
|
||||
/>
|
||||
<menuitem
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<form>
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
</config>
|
||||
<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
|
||||
<field
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<form>
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
</config>
|
||||
<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
|
||||
<field
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<form addfieldprefix="Joomla\Component\Plugins\Administrator\Field">
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
<config>
|
||||
<inlinehelp button="show"/>
|
||||
</config>
|
||||
<fieldset>
|
||||
<field
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
; (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
|
||||
; Joomla! Project
|
||||
; (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
|
||||
; License GNU General Public License version 2 or later; see LICENSE.txt
|
||||
; Note : All ini files need to be saved as UTF-8
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ $itemImage = $currentParams->get('menu_image');
|
|||
// Get the menu icon
|
||||
$icon = $this->getIconClass($current);
|
||||
$iconClass = ($icon != '' && $current->level == 1) ? '<span class="' . $icon . '" aria-hidden="true"></span>' : '';
|
||||
$ajax = $current->ajaxbadge ? '<span class="menu-badge"><span class="icon-spin icon-spinner mt-1 system-counter" data-url="' . $current->ajaxbadge . '"></span></span>' : '';
|
||||
$ajax = !empty($current->ajaxbadge) ? '<span class="menu-badge"><span class="icon-spin icon-spinner mt-1 system-counter" data-url="' . $current->ajaxbadge . '"></span></span>' : '';
|
||||
$iconImage = $current->icon;
|
||||
$homeImage = '';
|
||||
|
||||
|
|
@ -176,7 +176,7 @@ if ($currentParams->get('menu-quicktask') && (int) $this->params->get('shownew',
|
|||
}
|
||||
}
|
||||
|
||||
if ($current->dashboard)
|
||||
if (!empty($current->dashboard))
|
||||
{
|
||||
$titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($current->title));
|
||||
echo '<span class="menu-dashboard"><a href="'
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ There are three options here:
|
|||
- Legacy Javascript files must have an extension `.es5.js`.
|
||||
This instructs ESLint to skip checking this file.
|
||||
Also, it instructs the tools to create a minified version (production code WILL NOT have the `.es5` part)
|
||||
|
||||
|
||||
- Javascript files with only an extension `.js`.
|
||||
These files will be ignored by the build tools.
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ There are three options here:
|
|||
|
||||
Usually, the scope of a single contribution to the project should be limited. For example: fixing a CSS bug, a Javascript bug, some Markup, or a bug that involves changes in all these areas. The build tools were created so that you spend less time on compiling assets than testing a possible solution.
|
||||
|
||||
*Embrace the watchers*
|
||||
*Embrace the watchers*
|
||||
Let the computer help you succeed faster and safer. There are 2 watchers at the moment: one for the Media Manager (client app based on VueJS) and another one that handles templates and the source (build) folder.
|
||||
|
||||
Assuming that you are working on the Media Manager, you can run in your terminal (already in the root folder of the Joomla repo) `npm run watch:com_media`. This watcher will automatically recompile the app on every save (there is a debounce of 0.3s, so if you have autosave it will be a clever way to minimise the wait).
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ class Edit {
|
|||
new Edit();
|
||||
|
||||
/**
|
||||
* Compute the corrent URL
|
||||
* Compute the current URL
|
||||
*
|
||||
* @param {boolean} isModal is the URL for a modal window
|
||||
*
|
||||
|
|
|
|||
15
htaccess.txt
15
htaccess.txt
|
|
@ -16,6 +16,18 @@
|
|||
# set it here.
|
||||
##
|
||||
|
||||
## MISSING CSS OR JAVASCRIPT ERRORS
|
||||
#
|
||||
# If your site looks strange after enabling this file, then your server is probably already
|
||||
# gzipping css and js files and you should comment out the GZIP section of this file.
|
||||
##
|
||||
|
||||
## OPENLITESPEED
|
||||
#
|
||||
# If you are using an OpenLiteSpeed web server then any changes made to this file will
|
||||
# not take effect until you have restarted the web server.
|
||||
##
|
||||
|
||||
## Can be commented out if causes errors, see notes above.
|
||||
Options +FollowSymlinks
|
||||
Options -Indexes
|
||||
|
|
@ -124,10 +136,11 @@ Options -Indexes
|
|||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
## GZIP
|
||||
## These directives are only enabled if the Apache mod_headers module is enabled.
|
||||
## This section will check if a .gz file exists and if so will stream it
|
||||
## directly or fallback to gzip any asset on the fly
|
||||
## If your site starts to look strange after enabling this, and you see
|
||||
## If your site starts to look strange after enabling this file, and you see
|
||||
## ERR_CONTENT_DECODING_FAILED in your browser console network tab,
|
||||
## then your server is already gzipping css and js files and you don't need this
|
||||
## block enabled in your .htaccess
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Afrikaans (Suid-Afrika)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Projek</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Arabic (اللغة العربية)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Dr. Ashraf Damra</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Bulgarian (bg-BG)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Bulgaria</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Catalan (ca-ES)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Catalan Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Czech (Čeština)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Czech Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Welsh (United Kingdom)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project - Welsh Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Danish (Danmark)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ INSTL_DATABASE_ERROR_CREATE="Δυστυχώς παρουσιάστηκε σφά
|
|||
INSTL_DATABASE_ERROR_DELETE="Προέκυψαν κάποια σφάλματα κατά τη διαγραφή της βάσης δεδομένων."
|
||||
INSTL_DATABASE_ERROR_READING_SQL_FILE="Αδυναμία ανάγνωσης αρχείου SQL."
|
||||
INSTL_DATABASE_FIELD_VALUE_BACKUP="Αντίγραφο ασφαλείας"
|
||||
INSTL_DATABASE_FIELD_VALUE_REMOVE="Απομάκρυνση"
|
||||
INSTL_DATABASE_FIELD_VALUE_REMOVE="Διαγραφή"
|
||||
INSTL_DATABASE_FILE_DOES_NOT_EXIST="Το αρχείο %s δεν υπάρχει."
|
||||
INSTL_DATABASE_FIX_LOWERCASE="Το πρόθεμα του πίνακα πρέπει να είναι με πεζά για το PostgreSQL."
|
||||
INSTL_DATABASE_FIX_TOO_LONG="Το πρόθεμα του πίνακα MySQL πρέπει να είναι μέχρι 15 χαρακτήρες."
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Greek (el-GR)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<author>Ομάδα Μετάφρασης στα Ελληνικά: joomla. gr</author>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Ομάδα Μετάφρασης: joomla. gr</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
<files>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>English (Australia)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>English (Canada)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>English (New Zealand)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>English (United States)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Spanish (Spain)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Spanish [es-ES] Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Estonian</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Basque</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Basque Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>فارسی (دری)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>JoomlaPersian Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Persian (پارسی)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>JoomlaFarsi.Com Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Finnish (Suomi)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Finnish translation team: Joomla.fi</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>French (fr-FR)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project - French translation team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Hebrew (Israel)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Hungarian (Magyar)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Magyarország</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Italiano (it-IT)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Italian Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Japanese (ja-JP)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla!じゃぱん</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Georgian (Georgia)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Georgian Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Kazakh (Kazakhstan)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Sarvarov Akylkerey</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Latvian (Latvia)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Projekts</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Dutch (Belgium)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Dutch (BE) translation team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Dutch (nl-NL)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Dutch Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Polish (Poland)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Projekt Joomla!</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Português Brasil (pt-BR)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Projeto Joomla!</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Português (Portugal)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Comunidade JoomlaPortugal</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Română (România)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Horia Negura - Quanta</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Slovak (Slovakia)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Slovak translation team : Peter Michnica</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -195,29 +195,29 @@ JADMINISTRATOR="Skrbnik"
|
|||
JEMAIL="E-mail"
|
||||
JERROR="Napaka"
|
||||
JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Pojavila se je napaka med procesiranjem vaše zahteve."
|
||||
JGLOBAL_ISFREESOFTWARE="%s je brezplačna programska oprema izdana pod %s."
|
||||
JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezikovni paket se ne ujema s to Joomla različico. Morda manjkajo nekateri nizi in bodo prikazani v angleščini."
|
||||
JGLOBAL_ISFREESOFTWARE="%s je brezplačna programska oprema izdana pod <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\" rel=\"noopener noreferrer\">GNU General Public License</a>."
|
||||
JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezikovni paket se ne ujema s to Joomla! različico. Mogoče manjkajo nekateri nizi."
|
||||
JGLOBAL_SELECT_AN_OPTION="Izberite možnost"
|
||||
JGLOBAL_SELECT_NO_RESULTS_MATCH="Ni rezultatov ujemanja"
|
||||
JGLOBAL_SELECT_NO_RESULTS_MATCH="Ni zadetkov"
|
||||
JGLOBAL_SELECT_SOME_OPTIONS="Izberite nekaj možnosti"
|
||||
JHIDEPASSWORD="Skrijte geslo"
|
||||
JINVALID_TOKEN="Najnovejša zahteva zavrnjena, ker je imela neveljaven varnostni žeton. Prosimo, osvežite stran in poskusite znova."
|
||||
JINVALID_TOKEN_NOTICE="Varnostni žeton se ne ujema. Zahteva je bila prekinjena, da se prepreči kakršno koli kršitev varnosti. Prosim poskusite ponovno."
|
||||
JNEXT="Naprej"
|
||||
JNEXT="Naslednji"
|
||||
JNO="Ne"
|
||||
JNOTICE="Obvestilo"
|
||||
JOFF="Izklopljeno"
|
||||
JON="Vklopljeno"
|
||||
JPREVIOUS="Prejšnje"
|
||||
JOFF="Izključeno"
|
||||
JON="Vključeno"
|
||||
JPREVIOUS="Prejšnji"
|
||||
JSHOWPASSWORD="Prikažite geslo"
|
||||
JSITE="Stran"
|
||||
JSKIP="Preskoči"
|
||||
JUSERNAME="Uporabniško ime"
|
||||
JYES="Da"
|
||||
; Framework strings necessary when no lang pack is available
|
||||
JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ne morem se povezati z MySQL."
|
||||
JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ne morem se povezati na MySQL."
|
||||
JLIB_DATABASE_ERROR_DATABASE="Prišlo je do napake zbirke podatkov."
|
||||
JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ne morem naložiti gonilnikov za podatkovno bazo: %s."
|
||||
JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ni mogoče naložiti gonilnika baze podatkov: %s."
|
||||
JLIB_DATABASE_ERROR_VALID_MAIL="Vneseni e-poštni naslov je neveljaven. Vnesite drug e-poštni naslov."
|
||||
JLIB_ENVIRONMENT_SESSION_EXPIRED="Vaša seja je potekla, prosimo ponovno naložite stran."
|
||||
JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Pot ni mapa. Pot: %2$s"
|
||||
|
|
@ -250,7 +250,7 @@ SITE_NAME="Ime strani"
|
|||
MYSQL="MySQL (PDO)"
|
||||
MYSQLI="MySQLi"
|
||||
ORACLE="Oracle"
|
||||
PGSQL="PostgreSQL (PDO)"
|
||||
PGSQL="PostgreSQL (ZOP)"
|
||||
POSTGRESQL="PostgreSQL"
|
||||
SQLITE="SQLite"
|
||||
; Javascript message titles
|
||||
|
|
@ -269,7 +269,7 @@ JFIELD_PASSWORD_INDICATE_COMPLETE="Geslo sprejeto"
|
|||
JFIELD_PASSWORD_INDICATE_INCOMPLETE="Geslo ne ustreza zahtevam spletne strani."
|
||||
JFIELD_PASSWORD_SPACES_IN_PASSWORD="Geslo ne sme vsebovati presledkov na začetku ali na koncu."
|
||||
JFIELD_PASSWORD_TOO_LONG="Geslo je predolgo. Geslo mora biti manjše od 100 znakov."
|
||||
JFIELD_PASSWORD_TOO_SHORT_N="Geslo je prekratko. Geslo mora imeti vsaj %d znakov."
|
||||
JFIELD_PASSWORD_TOO_SHORT_N="Geslo je prekratko. Geslo mora imeti vsaj %s znakov."
|
||||
; Javascript Form Validation Messages
|
||||
JLIB_FORM_CONTAINS_INVALID_FIELDS="Obrazca ni mogoče oddati, kot da mu manjkajo zahtevani podatki. <br> Popravite označena polja in poskusite znova."
|
||||
JLIB_FORM_FIELD_INVALID_VALUE="Ta vrednost ni veljavna."
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Slovenščina (Slovenija)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Slovenska prevajalska ekipa</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Srpski Latinica (Republika Srbija)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Goran Nešić - UIX Web Design & Saša Matić Bardak.RS</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Swedish (Sweden)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Swedish Translation Team - SvenskJoomla</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Tamil (India)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Ilagnayeru 'MIG' Manickam, Elango Samy Manim</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Thai (ภาษาไทย)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Thai Translation Team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Turkish (Turkey)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Turkey</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>Ukrainian (uk-UA)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! Project - Ukrainian translation team</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>简体中文(中国)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>逐浪中文网 joomlachina.org.cn 周永建</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<metafile client="installation">
|
||||
<name>正體中文 (臺灣)</name>
|
||||
<version>4.1.4</version>
|
||||
<creationDate>May 2022</creationDate>
|
||||
<version>4.1.5</version>
|
||||
<creationDate>June 2022</creationDate>
|
||||
<author>Joomla! 專案</author>
|
||||
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
|
|
|
|||
|
|
@ -45,14 +45,11 @@ const completeInstallationOptions = document.querySelectorAll('.complete-install
|
|||
|
||||
completeInstallationOptions.forEach(function(item) {
|
||||
item.addEventListener('click', function (e) {
|
||||
// Once a button is clicked ensure they can't click it again...
|
||||
completeInstallationOptions.forEach(function(nestedItem) {
|
||||
nestedItem.disabled = true;
|
||||
});
|
||||
|
||||
// In development mode we show the user a pretty button to allow them to choose whether to delete the installation
|
||||
// directory or not. In stable release we always delete the folder. Maximum extermination!
|
||||
if ('development' in item.dataset) {
|
||||
// directory or not. In this case or when the installation folder has been deleted or might be partly deleted,
|
||||
// the buttons just redirect to the admin or site.
|
||||
// In stable release we always try to delete the folder at the first click. Maximum extermination!
|
||||
if ('development' in item.dataset || 'installremoved' in item.dataset) {
|
||||
window.location.href = item.dataset.href;
|
||||
} else {
|
||||
Joomla.deleteJoomlaInstallationDirectory(item.dataset.href);
|
||||
|
|
@ -70,6 +67,19 @@ Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
|
|||
token: true,
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
onSuccess: function (response) {
|
||||
// If the installation folder has been deleted at least partly, i.e. also
|
||||
// in case of a failure, we cannot use it anymore.
|
||||
// Therefore set a marker in the admin and site buttons so they still work
|
||||
// and disable buttons which will not work anymore.
|
||||
completeInstallationOptions.forEach(function(item) {
|
||||
item.dataset.installremoved = 'true';
|
||||
});
|
||||
if (document.getElementById('installAddFeatures')) {
|
||||
document.getElementById('installAddFeatures').disabled = true;
|
||||
}
|
||||
if (document.getElementById('removeInstallationFolder')) {
|
||||
document.getElementById('removeInstallationFolder').disabled = true;
|
||||
}
|
||||
const successresponse = JSON.parse(response);
|
||||
if (successresponse.error === true) {
|
||||
if (successresponse.messages) {
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class Cache
|
|||
{
|
||||
$handlers = array();
|
||||
|
||||
// Get an iterator and loop trough the driver classes.
|
||||
// Get an iterator and loop through the driver classes.
|
||||
$iterator = new \DirectoryIterator(__DIR__ . '/Storage');
|
||||
|
||||
/** @type $file \DirectoryIterator */
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ class Form
|
|||
* @param mixed $default The optional default value of the field value is empty.
|
||||
* @param array $options Any options to be passed into the rendering of the field
|
||||
*
|
||||
* @return string A string containing the html for the control goup
|
||||
* @return string A string containing the html for the control group
|
||||
*
|
||||
* @since 3.2.3
|
||||
*/
|
||||
|
|
@ -598,7 +598,7 @@ class Form
|
|||
* @param string $name The name of the fieldset for which to get the values.
|
||||
* @param array $options Any options to be passed into the rendering of the field
|
||||
*
|
||||
* @return string A string containing the html for the control goups
|
||||
* @return string A string containing the html for the control groups
|
||||
*
|
||||
* @since 3.2.3
|
||||
*/
|
||||
|
|
@ -1417,8 +1417,6 @@ class Form
|
|||
*/
|
||||
protected function &findFieldsByFieldset($name)
|
||||
{
|
||||
$false = false;
|
||||
|
||||
// Make sure there is a valid Form XML document.
|
||||
if (!($this->xml instanceof \SimpleXMLElement))
|
||||
{
|
||||
|
|
@ -1450,7 +1448,6 @@ class Form
|
|||
*/
|
||||
protected function &findFieldsByGroup($group = null, $nested = false)
|
||||
{
|
||||
$false = false;
|
||||
$fields = [];
|
||||
|
||||
// Make sure there is a valid Form XML document.
|
||||
|
|
@ -1523,7 +1520,6 @@ class Form
|
|||
*/
|
||||
protected function &findGroup($group)
|
||||
{
|
||||
$false = false;
|
||||
$groups = [];
|
||||
$tmp = [];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ use Joomla\Registry\Registry;
|
|||
class CssIdentifierSubstringRule extends FormRule
|
||||
{
|
||||
/**
|
||||
* Method to test if a string is a valid CSS identifer substring
|
||||
* Method to test if a string is a valid CSS identifier substring
|
||||
*
|
||||
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
|
||||
* @param mixed $value The form field value to validate.
|
||||
|
|
|
|||
|
|
@ -654,6 +654,11 @@ abstract class HTMLHelper
|
|||
'height' => 0,
|
||||
];
|
||||
|
||||
if ($url === null)
|
||||
{
|
||||
$url = '';
|
||||
}
|
||||
|
||||
if (!strpos($url, '?'))
|
||||
{
|
||||
$obj->url = $url;
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class Text
|
|||
private static function passSprintf(&$string, $jsSafe = false, $interpretBackSlashes = true, $script = false)
|
||||
{
|
||||
// Check if string contains a comma
|
||||
if (strpos($string, ',') === false)
|
||||
if (empty($string) || strpos($string, ',') === false)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class Session extends BaseSession
|
|||
{
|
||||
$connectors = [];
|
||||
|
||||
// Get an iterator and loop trough the handler classes.
|
||||
// Get an iterator and loop through the handler classes.
|
||||
$iterator = new \DirectoryIterator(JPATH_LIBRARIES . '/vendor/joomla/session/src/Handler');
|
||||
|
||||
foreach ($iterator as $file)
|
||||
|
|
|
|||
|
|
@ -1461,7 +1461,7 @@ abstract class Table extends CMSObject implements TableInterface, DispatcherAwar
|
|||
*
|
||||
* If the row is checked out by the same user, then it is considered not checked out -- as the user can still edit it.
|
||||
*
|
||||
* @param integer $with The user ID to preform the match with, if an item is checked out by this user the function will return false.
|
||||
* @param integer $with The user ID to perform the match with, if an item is checked out by this user the function will return false.
|
||||
* @param integer $against The user ID to perform the match against when the function is used as a static function.
|
||||
*
|
||||
* @return boolean True if checked out.
|
||||
|
|
|
|||
0
plugins/twofactorauth/totp/tmpl/form.php
Normal file
0
plugins/twofactorauth/totp/tmpl/form.php
Normal file
|
|
@ -202,7 +202,7 @@ class Banner extends Admin
|
|||
$I->amOnPage(BannerListPage::$url);
|
||||
$I->waitForElement(BannerListPage::$searchField, $I->getConfig('timeout'));
|
||||
|
||||
// Make sure that the element js-stools-container-filters is visible.
|
||||
// Make sure that the element js-stools-container-filters is visible.
|
||||
// Filter is a toggle button and I never know what happened before.
|
||||
$I->executeJS("[].forEach.call(document.querySelectorAll('.js-stools-container-filters'), function (el) {
|
||||
el.classList.add('js-stools-container-filters-visible');
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ class Content extends Admin
|
|||
{
|
||||
$I = $this;
|
||||
|
||||
// Make sure that the class js-stools-container-filters is visible.
|
||||
// Make sure that the class js-stools-container-filters is visible.
|
||||
// Filter is a toggle button and I never know what happened before.
|
||||
$I->executeJS("[].forEach.call(document.querySelectorAll('.js-stools-container-filters'), function (el) {
|
||||
el.classList.add('js-stools-container-filters-visible');
|
||||
|
|
|
|||
|
|
@ -31,39 +31,39 @@ class ExtensionDiscoverCommandTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
/**
|
||||
* Tests the processDiscover method
|
||||
* Ensure that the return value is an integer.
|
||||
* Ensure that the return value is an integer.
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
*
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public function testProcessDiscoverReturnIsInt()
|
||||
{
|
||||
$command = $this->createMock(ExtensionDiscoverCommand::class);
|
||||
|
||||
|
||||
$countOfDiscoveredExtensions = $command->processDiscover();
|
||||
|
||||
|
||||
$this->assertIsInt($countOfDiscoveredExtensions);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the getNote method
|
||||
* Ensure that the note is correct.
|
||||
*
|
||||
* Ensure that the note is correct.
|
||||
*
|
||||
* @param int $count Number of extensions to discover
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
*
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public function testGetNote()
|
||||
{
|
||||
$command = $this->createExtensionDiscoverCommand();
|
||||
|
||||
|
||||
$note0 = $command->getNote(0);
|
||||
$note1 = $command->getNote(1);
|
||||
$note2 = $command->getNote(2);
|
||||
|
||||
|
||||
$this->assertSame($note0, 'No extensions were discovered.');
|
||||
$this->assertSame($note1, '1 extension has been discovered.');
|
||||
$this->assertSame($note2, '2 extensions have been discovered.');
|
||||
|
|
|
|||
|
|
@ -32,20 +32,20 @@ class ExtensionDiscoverInstallCommandTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
/**
|
||||
* Tests the processDiscover method
|
||||
* Ensure that the return value is an integer.
|
||||
* Ensure that the return value is an integer.
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
*
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public function testProcessDiscoverReturnIsInt()
|
||||
{
|
||||
$command = $this->createMock(ExtensionDiscoverInstallCommand::class);
|
||||
|
||||
|
||||
$countOfDiscoveredExtensions1 = $command->processDiscover(-1);
|
||||
$countOfDiscoveredExtensions0 = $command->processDiscover(0);
|
||||
$countOfDiscoveredExtensions245 = $command->processDiscover(245);
|
||||
|
||||
|
||||
$this->assertIsInt($countOfDiscoveredExtensions1);
|
||||
$this->assertIsInt($countOfDiscoveredExtensions0);
|
||||
$this->assertIsInt($countOfDiscoveredExtensions245);
|
||||
|
|
@ -53,16 +53,16 @@ class ExtensionDiscoverInstallCommandTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
/**
|
||||
* Tests the getNote method
|
||||
* Ensure that the note is correct.
|
||||
* Ensure that the note is correct.
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
*
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public function testGetNote()
|
||||
{
|
||||
$command = $this->createExtensionDiscoverInstallCommand();
|
||||
|
||||
|
||||
$note0 = $command->getNote(-1, 1);
|
||||
$note1 = $command->getNote(-1, -1);
|
||||
$note2 = $command->getNote(0, 1);
|
||||
|
|
@ -70,7 +70,7 @@ class ExtensionDiscoverInstallCommandTest extends \PHPUnit\Framework\TestCase
|
|||
$note4 = $command->getNote(1, -1);
|
||||
$note5 = $command->getNote(2, -1);
|
||||
$note6 = $command->getNote(2, 1);
|
||||
|
||||
|
||||
$this->assertSame($note0, 'Unable to install the extension with ID 1');
|
||||
$this->assertSame($note1, 'Unable to install discovered extensions.');
|
||||
$this->assertSame($note2, 'There are no pending discovered extensions for install. Perhaps you need to run extension:discover first?');
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ class ExtensionDiscoverListCommandTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
/**
|
||||
* Tests the filterExtensionsBasedOnState method
|
||||
* Ensure that the return value is an array and the filter works correctly.
|
||||
* Ensure that the return value is an array and the filter works correctly.
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
*
|
||||
* @since 4.0.0
|
||||
*/
|
||||
public function testFilterExtensions()
|
||||
|
|
@ -51,7 +51,7 @@ class ExtensionDiscoverListCommandTest extends \PHPUnit\Framework\TestCase
|
|||
$extensions1 = array();
|
||||
$extensions1[0] = array('state' => 0);
|
||||
$extensions1[1] = array('state' => -1);
|
||||
|
||||
|
||||
$extensions2 = array();
|
||||
$extensions2[0] = array('state' => -1);
|
||||
$extensions2[1] = array('state' => -1);
|
||||
|
|
@ -59,7 +59,7 @@ class ExtensionDiscoverListCommandTest extends \PHPUnit\Framework\TestCase
|
|||
$filteredextensionsArray0 = $command->filterExtensionsBasedOnState($extensions0, $state);
|
||||
$filteredextensionsArray1 = $command->filterExtensionsBasedOnState($extensions1, $state);
|
||||
$filteredextensionsArray2 = $command->filterExtensionsBasedOnState($extensions2, $state);
|
||||
|
||||
|
||||
$size0 = sizeof($filteredextensionsArray0);
|
||||
$size1 = sizeof($filteredextensionsArray1);
|
||||
$size2 = sizeof($filteredextensionsArray2);
|
||||
|
|
@ -67,7 +67,7 @@ class ExtensionDiscoverListCommandTest extends \PHPUnit\Framework\TestCase
|
|||
$this->assertSame($size0, 0);
|
||||
$this->assertSame($size1, 1);
|
||||
$this->assertSame($size2, 2);
|
||||
|
||||
|
||||
$this->assertIsArray($filteredextensionsArray0);
|
||||
$this->assertIsArray($filteredextensionsArray1);
|
||||
$this->assertIsArray($filteredextensionsArray2);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class FolderPathExistsRuleTest extends UnitTestCase
|
|||
|
||||
return [
|
||||
[true, $xml, ''],
|
||||
[false, $xml, JPATH_ROOT],
|
||||
[false, $xml, JPATH_ROOT],
|
||||
[true, $xml, 'images'],
|
||||
[true, $xml, 'images/headers'],
|
||||
[false, $xml, 'images/notexisting'],
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user