Merge pull request #31409 from bembelimen/4.1-dev

Update 4.1-dev from 4.0-dev

.appveyor.yml

@@ -71,7 +71,7 @@ install:
     - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
     - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini
     - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-    - IF %PHP%==1 php -r "readfile('http://getcomposer.org/installer');" | php
+    - IF %PHP%==1 php -r "readfile('https://getcomposer.org/composer-1.phar');" > composer.phar
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
 before_test:

.drone.yml

@@ -24,7 +24,7 @@ steps:
       - echo $(date)
 
   - name: npm
-    image: node:current-alpine
+    image: node:14-alpine
     depends_on: [ phpcs ]
     commands:
       - npm ci --unsafe-perm
@@ -120,28 +120,16 @@ steps:
     depends_on: [ npm ]
     image: node:current-alpine
     commands:
-      - npx stylelint -s scss "administrator/components/com_media/resources/**/*.scss" "administrator/templates/**/*.scss" "build/media_source/**/*.scss" "templates/**/*.scss" "installation/template/**/*.scss"
+      - npm run lint:css
 
   - name: javascript-cs
     depends_on: [ npm ]
     image: node:current-alpine
     commands:
-      - npx eslint "**/*.js"
-
-  - name: javascript-tests
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:systemtests
-    environment:
-      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-    commands:
-      - export DISPLAY=:0
-      - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
-      - sleep 3
-      - fluxbox  > /dev/null 2>&1 &
-      - npm run test
+      - npm run lint:js
 
   - name: system-tests-mysql
-    depends_on: [ javascript-tests ]
+    depends_on: [ javascript-cs ]
     image: joomlaprojects/docker-images:systemtests
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
@@ -215,15 +203,9 @@ branches:
   exclude: [ l10n_* ]
 
 volumes:
-- name: cache
-  host:
-    path: /tmp/cache
 - name: composer-cache
   host:
     path: /tmp/composer-cache
-- name: reference
-  host:
-    path: /tmp/reference
 
 services:
   - name: mysql
@@ -243,12 +225,6 @@ services:
       MYSQL_ROOT_PASSWORD: joomla_ut
       MYSQL_DATABASE: test_joomla
 
-  - name: memcached
-    image: memcached:alpine
-
-  - name: redis
-    image: redis:alpine
-
   - name: postgres
     image: postgres:11-alpine
     ports:
@@ -293,6 +269,6 @@ steps:
 
 ---
 kind: signature
-hmac: 6181992bedb16a68cc0f328c256b9b6707ec0c3a5e5be551e1a76b2d6740c9c8
+hmac: 71729a12ae3556e03f924ac95c8a5cd14bb6a3c2d20ef6768fdd1e853397fd22
 
 ...

.editorconfig

@@ -11,6 +11,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,json,scss,css}]
+[*.{js,json,scss,css,vue}]
 indent_style = space
 indent_size = 2

.github/CODEOWNERS

@@ -49,11 +49,10 @@ administrator/components/com_csp/* @zero-24
 components/com_csp/* @zero-24
 
 # Web Authentication (WebAuthn)
-
 plugins/system/webauthn/*   @nikosdion
 media/plg_system_webauthn/*   @nikosdion
-language/administrator/en-GB/en-GB.plg_system_webauthn.ini   @nikosdion
-language/administrator/en-GB/en-GB.plg_system_webauthn.sys.ini   @nikosdion
+administrator/language/en-GB/plg_system_webauthn.ini   @nikosdion
+administrator/language/en-GB/plg_system_webauthn.sys.ini   @nikosdion
 
 # Workflow
 administrator/components/com_workflow/*	@bembelimen @hleithner

administrator/components/com_actionlogs/src/Field/PlugininfoField.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
@@ -59,7 +59,7 @@ protected function getInput()
 		);
 
 		return '<div class="alert alert-info">'
-			. '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">'
+			. '<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only">'
 			. Text::_('INFO')
 			. '</span>'
 			. Text::sprintf('PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED_REDIRECT', $link)

administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php

@@ -123,7 +123,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'fas fa-list-ul');
+		ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'icon-list-ul');
 
 		ToolbarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
 		ToolbarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);

administrator/components/com_actionlogs/tmpl/actionlogs/default.php

@@ -34,7 +34,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>

administrator/components/com_admin/forms/profile.xml

@@ -24,6 +24,9 @@
 			name="password"
 			type="password"
 			label="JGLOBAL_PASSWORD"
+			description="JFIELD_PASSWORD_RULES_MINIMUM_REQUIREMENTS"
+			hiddenDescription="true"
+			rules="true"
 			autocomplete="new-password"
 			class="validate-password-strength"
 			filter="raw"

administrator/components/com_admin/postinstall/textfilter3919.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in the default textfilter settings
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Notifies users the changes from the default textfilter.
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   3.9.19
+ */
+function admin_postinstall_textfilter3919_condition()
+{
+	return true;
+}