Merge branch '4.0-dev' of github.com:joomla/joomla-cms into properlay…

…outs * '4.0-dev' of github.com:joomla/joomla-cms: (612 commits) [4.0] Smart Search: Fixing ordering, order direction and disabled button (joomla#29474) [4.0] Generate routed Modal links for iframes when not on the root (joomla#30007) [4.0] Get menu directly in com_tags menu route helper (joomla#30039) Remove collapse when resizing from mobile to desktop (joomla#30132) [4.0] Wrap component output in `main` element to make Cassiopeia more accessible (joomla#29870) [4.0] Webauthn gmp warning (joomla#29731) [4.0] Refactor to return early, remove if depths and throw NotAllowed (joomla#29694) [4.0] CLI help text (joomla#29811) Feature/draggable typo fixes (joomla#29987) [4.0] Removing unnecessary workaround in finder indexer (joomla#30037) [4.0] Optimizing Smart Search for larger content (joomla#30008) [4.0] Fix js ajax for pre update checker (joomla#29980) [4.0] Cassiopea: Fixing modals custom-select fields display (joomla#30097) [4.0][com_fields] Fix draggable sorting (joomla#30094) [4.0] Correct incorrect @return documentation (joomla#30092) [4.0] Menu items modal: adding missing filters (joomla#30087) short to long php open tags with echo (joomla#30089) Use new Toolbar (joomla#30085) [4.0] Center status/date created headers (joomla#29249) [4.0] Fix Cassiopea searchtools alignment in modals (joomla#30077) ... # Conflicts: # administrator/components/com_templates/src/View/Template/HtmlView.php # installation/sql/postgresql/base.sql # libraries/src/Application/AdministratorApplication.php # libraries/src/Application/SiteApplication.php
dgrammatiko · Jul 21, 2020 · ac2c4e6 · ac2c4e6
2 parents d3d55af + 876163b
commit ac2c4e6
Show file tree

Hide file tree

Showing 3,461 changed files with 22,145 additions and 15,669 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -71,8 +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
-    - appveyor-retry appveyor DownloadFile https://getcomposer.org/download/1.10.5/composer.phar
-    - appveyor-retry composer self-update
+    - IF %PHP%==1 php -r "readfile('http://getcomposer.org/installer');" | php
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
 before_test:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -54,3 +54,18 @@ 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
+
+# Workflow
+administrator/components/com_workflow/*	@bembelimen @hleithner
+administrator/language/en-GB/com_workflow.ini	@bembelimen @hleithner
+administrator/language/en-GB/com_workflow.sys.ini	@bembelimen @hleithner
+administrator/language/en-GB/plg_workflow_publishing.ini	@bembelimen @hleithner
+administrator/language/en-GB/plg_workflow_publishing.sys.ini	@bembelimen @hleithner
+libraries/src/Form/Field/TransitionField.php	@bembelimen @hleithner
+libraries/src/Form/Field/Workflow*	@bembelimen @hleithner
+libraries/src/HTML/Helpers/Workflow*	@bembelimen @hleithner
+libraries/src/MVC/Model/Workflow*	@bembelimen @hleithner
+libraries/src/MVC/Model/Workflow*	@bembelimen @hleithner
+libraries/src/Workflow/*	@bembelimen @hleithner
+build/media_source/com_workflow/*	@bembelimen @hleithner
+plugins/workflow/*	@bembelimen @hleithner
diff --git a/.github/ISSUE_TEMPLATE/rfc.md b/.github/ISSUE_TEMPLATE/rfc.md
@@ -0,0 +1,13 @@
+---
+name: Start a Request for Comment
+about: Start a Request for Comment discussion
+
+---
+
+### Problem identified
+
+
+### Proposed solution
+
+
+### Open questions
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,14 @@
-# IDE & System Related Files #
+# IDE & System Related Files
 .buildpath
 .project
 .settings
 .DS_Store
 .idea
 .vscode
+.docker
+/docker-compose.yml
 
-# Local System Files (i.e. cache, logs, etc.) #
+# Local System Files (i.e. cache, logs, etc.)
 /administrator/cache
 /administrator/logs
 /cache
@@ -20,15 +22,15 @@
 /.php_cs.cache
 /media
 
-# Template CSS files generated by NPM.
+# Template CSS files generated by NPM
 /administrator/templates/atum/css
 /installation/template/css/template-rtl.min.css
 /installation/template/css/template-rtl.css
 /installation/template/css/template.min.css
 /installation/template/css/template.css
 /templates/cassiopeia/css
 
-# Test Related Files #
+# Test Related Files
 /phpunit.xml
 selenium.log
 composer.phar
@@ -39,7 +41,7 @@ composer.phar
 /tests/Codeception/api.suite.yml
 
 
-# Vendor directory handeling
+# Vendor directory handling
 /libraries/vendor
 !libraries/vendor/.gitkeep
 
@@ -49,31 +51,31 @@ composer.phar
 # Stubs file holding mapped classes
 /stubs.php
 
-# JS/CSS Build #
+# JS/CSS Build
 node_modules/
 /build/assets_tmp
 /scss-lint-report.xml
 
-# Removed in Joomla 4 #
+# Removed in Joomla 4
 administrator/templates/isis
 administrator/templates/hathor
 templates/beez3
 build/generatecss.php
 media/jui/less
 
-# CSS map files #
+# CSS map files
 .map
 
-# phpDocumentor Logs #
+# phpDocumentor Logs
 phpdoc-*
 
-# Patch Tester #
+# Patch Tester
 /administrator/components/com_patchtester
 /administrator/templates/atum/html/com_patchtester
 /components/com_patchtester
 /media/com_patchtester
 
-# Languages #
+# Languages
 administrator/language/*
 !administrator/language/en-GB
 administrator/manifests/packages/*
@@ -85,21 +87,20 @@ language/*
 !language/en-GB
 !language/overrides/index.html
 
-# OSX #
+# OSX
 ._*
 .Spotlight-V100
 .Trashes
 
-# Windows #
+# Windows
 Thumbs.db
 Desktop.ini
 
-# Never ignore #
+# Never ignore
 # Only apply this rule to the main repository's gitignore files
 !/.gitignore
 !/build/.gitignore
 
-
 # Build related
 RoboFile.ini
 

diff --git a/README.md b/README.md
@@ -73,6 +73,6 @@ Do you want to improve Joomla?
 
 Copyright
 ---------------------
-* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+* Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
 * Distributed under the GNU General Public License version 2 or later
 * See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
diff --git a/README.txt b/README.txt
@@ -69,6 +69,6 @@ Joomla! CMS™
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
 
 Copyright:
-	* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+	* Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
 	* Distributed under the GNU General Public License version 2 or later
 	* See License details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
diff --git a/administrator/components/com_actionlogs/actionlogs.xml b/administrator/components/com_actionlogs/actionlogs.xml
@@ -3,7 +3,7 @@
 	<name>com_actionlogs</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/components/com_actionlogs/layouts/logstable.php b/administrator/components/com_actionlogs/layouts/logstable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/services/provider.php b/administrator/components/com_actionlogs/services/provider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Controller/DisplayController.php b/administrator/components/com_actionlogs/src/Controller/DisplayController.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Field/ExtensionField.php b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php b/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Field/LogtypeField.php b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php b/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -123,7 +123,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'list-2');
+		ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'fas fa-list-ul');
 
 		ToolbarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
 		ToolbarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);

diff --git a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,7 +21,11 @@
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 
-HTMLHelper::_('script', 'com_actionlogs/admin-actionlogs-default.js', ['relative' => true, 'version' => 'auto']);
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->document->getWebAssetManager();
+$wa->useScript('keepalive')
+	->useScript('com_actionlogs.admin-actionlogs');
+
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="adminForm" id="adminForm">

diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
@@ -3,7 +3,7 @@
 	<name>com_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2020 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>