Merge branch '4.0-dev' into Change_Favicon_Order

.drone.yml

@@ -1,25 +1,32 @@
-pipeline:
-  clone:
-    image: plugins/git
-    depth: 1
+---
+kind: pipeline
+name: default
 
-  phpcs:
+clone:
+  depth: 42
+
+steps:
+  - name: phpcs
     image: joomlaprojects/docker-phpcs
     commands:
       - echo $(date)
       - /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
       - echo $(date)
 
-  restore-cache:
-      image: drillster/drone-volume-cache
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    settings:
       restore: true
       mount:
         - ./node_modules
         - ./libraries/vendor
-      volumes:
-        - /tmp/cache:/cache
+        - ./administrator/components/com_media/node_modules
+      cache_key: [ DRONE_REPO_NAMESPACE, DRONE_REPO_NAME, DRONE_BRANCH, DRONE_STAGE_NUMBER ]
+    volumes:
+      - name: cache
+        path: /cache
 
-  prepare:
+  - name: prepare
     image: joomlaprojects/docker-tools:develop
     commands:
       - composer install --no-progress --no-suggest
@@ -30,34 +37,38 @@ pipeline:
       - composer update joomla-projects/joomla-browser --no-progress --no-suggest
       - npm install --unsafe-perm
 
-  rebuild-cache:
-      image: drillster/drone-volume-cache
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    settings:
       rebuild: true
       mount:
         - ./node_modules
         - ./libraries/vendor
-      volumes:
-        - /tmp/cache:/cache
+        - ./administrator/components/com_media/node_modules
+      cache_key: [ DRONE_REPO_NAMESPACE, DRONE_REPO_NAME, DRONE_BRANCH, DRONE_STAGE_NUMBER ]
+    volumes:
+      - name: cache
+        path: /cache
 
-  php70-unit:
+  - name: php70-unit
     group: unit
     image: joomlaprojects/docker-php70:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
-  php71-unit:
+  - name: php71-unit
     group: unit
     image: joomlaprojects/docker-php71:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
-  php72-unit:
+  - name: php72-unit
     group: unit
     image: joomlaprojects/docker-php72:develop
     commands:
       - ./libraries/vendor/bin/phpunit
 
-  javascript-cs:
+  - name: javascript-cs
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -66,7 +77,7 @@ pipeline:
       - fluxbox  > /dev/null 2>&1 &
       - npm run lint:js
 
-  javascript-tests:
+  - name: javascript-tests
     image: joomlaprojects/docker-systemtests:develop
     commands:
       - export DISPLAY=:0
@@ -75,57 +86,59 @@ pipeline:
       - fluxbox  > /dev/null 2>&1 &
       - npm run test
 
-  system-tests:
-      image: joomlaprojects/docker-systemtests:develop
-      commands:
-        - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
+  - name: system-tests
+    image: joomlaprojects/docker-systemtests:develop
+    commands:
+      - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)"
 
-  api-tests:
+  - name: api-tests
     image: joomlaprojects/docker-systemtests:latest
     commands:
       - bash libraries/vendor/joomla/test-api/drone-run.sh "$(pwd)"
 
-  analysis3x:
-      image: rips/rips-cli:1.2.1
-      secrets:  [rips_username, rips_password]
-      when:
-        branch: staging
-      commands:
-        - export RIPS_BASE_URI='https://api.rips.joomla.org'
-        - export RIPS_USERNAME=$RIPS_USERNAME
-        - export RIPS_PASSWORD=$RIPS_PASSWORD
-        - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-        - rips-cli rips:scan:start -a 1 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
-
-  analysis4x:
+  - name: analysis4x
     image: rips/rips-cli:1.2.1
-    secrets:  [rips_username, rips_password]
     when:
       branch: 4.0-dev
     commands:
       - export RIPS_BASE_URI='https://api.rips.joomla.org'
-      - export RIPS_USERNAME=$RIPS_USERNAME
-      - export RIPS_PASSWORD=$RIPS_PASSWORD
-      - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - if [ $DRONE_REPO_NAMESPACE != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
+      - rips-cli rips:scan:start -a 3 -t 1 -R -k -p $(pwd) -t 1 -T $DRONE_REPO_NAMESPACE-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+    environment:
+      RIPS_USERNAME:
+        from_secret: RIPS_USERNAME
+      RIPS_PASSWORD:
+        from_secret: RIPS_PASSWORD
 
 branches:
   exclude: [ l10n_* ]
 
+
+volumes:
+- name: cache
+  host:
+    path: /tmp/cache
+
 services:
-  mysql:
+  - name: mysql
     image: mysql:5.7
     environment:
       MYSQL_USER: joomla_ut
       MYSQL_PASSWORD: joomla_ut
       MYSQL_ROOT_PASSWORD: joomla_ut
       MYSQL_DATABASE: test_joomla
 
-  memcached:
+  - name: memcached
     image: memcached:alpine
 
-  redis:
+  - name: redis
     image: redis:alpine
 
-  postgres:
+  - name: postgres
     image: postgres
+
+---
+kind: signature
+hmac: 8aa5446bfea3fbb295ae9ca362c72f82738cca714f5670f9bf70da1c02d1ad45
+
+...

.eslintignore

@@ -12,5 +12,4 @@ joomla-field-permissions.w-c.es6.js
 joomla-field-send-test-mail.w-c.es6.js
 joomla-field-simple-color.w-c.es6.js
 joomla-field-subform.w-c.es6.js
-joomla-field-switcher.w-c.es6.js
 # End of TODO

.github/CODEOWNERS

@@ -13,13 +13,6 @@ plugins/systems/fields/*  @laoneo
 #plugins/content/finder/*
 #plugins/finder/*
 
-# Language strings
-administrator/language/en-GB/*  @brianteeman
-installation/language/en-GB/*  @brianteeman
-language/en-GB/*  @brianteeman
-README.md  @brianteeman
-README.txt  @brianteeman
-
 # CodeMirror
 media/editors/codemirror/*  @okonomiyaki3000
 plugins/editors/codemirror/*  @okonomiyaki3000

.github/CONTRIBUTING.md

@@ -19,7 +19,6 @@ There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
-| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
-| 3.9-dev | Branch for the next minor Joomla version. The 3.9.0 release will include the Privacy Tools Suite features. Commits to staging will be applied to this branch as well. |
+| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
 | 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
 | 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |

.github/SUPPORT.md

@@ -1,8 +1,8 @@
 Where can you get support and help?
 ====================
-* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page);
-* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ);
-* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
-* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
-* Post questions at [our forums](https://forum.joomla.org);
+* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page).
+* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ).
+* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here).
+* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html).
+* Post questions at [our forums](https://forum.joomla.org).
 * [Joomla Resources Directory](https://resources.joomla.org) (JRD).

.travis.yml

@@ -8,6 +8,7 @@ matrix:
   include:
     - php: nightly
   allow_failures:
+    - php: 7.3
     - php: nightly
 
 before_script:

README.md

@@ -45,6 +45,10 @@ git clone git@github.com:joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
+- Go to the 4.0-dev branch:
+```bash
+git checkout 4.0-dev
+```
 - Install all the needed composer packages:
 ```bash
 composer install

administrator/components/com_actionlogs/actionlogs.php

@@ -3,13 +3,13 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-if (!JFactory::getUser()->authorise('core.manage', 'com_actionlogs'))
+if (!JFactory::getUser()->authorise('core.admin'))
 {
 	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }

administrator/components/com_actionlogs/actionlogs.xml

@@ -3,11 +3,11 @@
 	<name>com_actionlogs</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2018</creationDate>
-	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>__DEPLOY_VERSION__</version>
+	<version>3.9.0</version>
 	<description>COM_ACTIONLOGS_XML_DESCRIPTION</description>
 	<administration>
 		<menu>COM_ACTIONLOGS</menu>

administrator/components/com_actionlogs/config.xml

@@ -4,19 +4,19 @@
 		<field
 			name="ip_logging"
 			type="radio"
-			label="COM_ACTIONLOGS_IP_LOGGING"
+			label="COM_ACTIONLOGS_IP_LOGGING_LABEL"
 			description="COM_ACTIONLOGS_IP_LOGGING_DESC"
-			class="btn-group btn-group-yesno"
+			class="switcher"
 			default="0"
 			filter="integer"
 			>
-			<option value="1">JYES</option>
 			<option value="0">JNO</option>
+			<option value="1">JYES</option>
 		</field>
 		<field
 			name="csv_delimiter"
 			type="list"
-			label="COM_ACTIONLOGS_CSV_DELIMITER"
+			label="COM_ACTIONLOGS_CSV_DELIMITER_LABEL"
 			description="COM_ACTIONLOGS_CSV_DELIMITER_DESC"
 			default=","
 			>
@@ -26,7 +26,7 @@
 		<field
 			name="loggable_extensions"
 			type="logtype"
-			label="COM_ACTIONLOGS_LOG_EXTENSIONS"
+			label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
 			description="COM_ACTIONLOGS_LOG_EXTENSIONS_DESC"
 			multiple="true"
 			default="com_banners,com_cache,com_categories,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"

administrator/components/com_actionlogs/controller.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_actionlogs
  *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 /**
  * Actionlogs Controller
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.9.0
  */
 class ActionlogsController extends JControllerLegacy
 {