diff --git a/.drone.yml b/.drone.yml
index e80834c1c0975..1c71301190fd9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,5 @@
build:
- image: yveshoppe/joomla-systemtests:latest
+ image: joomlaprojects/docker-systemtests:latest
commands:
- apt-get install nodejs npm
- ln -s /usr/bin/nodejs /usr/bin/node
diff --git a/.gitignore b/.gitignore
index 2f8c9c9b1241c..16e231be50131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,10 +101,11 @@ Desktop.ini
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
+/libraries/vendor/phpmailer/phpmailer/composer.lock
+/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
+/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
-/libraries/vendor/phpmailer/phpmailer/extras/README.md
-/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/psr/log/Psr/Log/Test
/libraries/vendor/psr/log/.gitignore
/libraries/vendor/psr/log/composer.json
diff --git a/README.md b/README.md
index 2cd9d959bafe2..98fbbd77685a8 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@ What is this?
What is Joomla?
---------------------
-* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
-* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
+* Joomla! is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
Is Joomla! for you?
---------------------
-* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
+* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
* View Joomla's [core features here](https://www.joomla.org/core-features.html).
* Try it out for yourself in our [online demo](https://demo.joomla.org).
@@ -38,9 +38,9 @@ Learn Joomla!
What are the benefits of Joomla?
---------------------
-* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
* There are many ready-made extensions that you can download and install.
-* Check out the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org).
+* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).
Is it easy to change the layout display?
---------------------
diff --git a/README.txt b/README.txt
index 9042958105877..b3754aa3af95b 100644
--- a/README.txt
+++ b/README.txt
@@ -5,13 +5,13 @@
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
2- What is Joomla?
- * Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
+ * Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later.
* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run.
You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
3- Is Joomla! for you?
- * Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+ * Joomla! is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
* See Joomla's core features - https://www.joomla.org/core-features.html
* Try out our online demo: https://demo.joomla.org/
@@ -25,9 +25,9 @@
* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
6- What are the benefits of Joomla?
- * The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+ * The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
* There are many ready-made extensions that you can download and install.
- * Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+ * Check out the Joomla! Extensions Directory (JED): https://extensions.joomla.org
7- Is it easy to change the layout display?
* The layout is controlled by templates that you can edit.
diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php
index eef635d2d5447..c97e6590303f0 100644
--- a/administrator/components/com_installer/helpers/installer.php
+++ b/administrator/components/com_installer/helpers/installer.php
@@ -121,25 +121,6 @@ public static function getExtensionGroupes()
return $options;
}
- /**
- * Gets a list of the actions that can be performed.
- *
- * @return JObject
- *
- * @since 1.6
- * @deprecated 3.2 Use JHelperContent::getActions() instead
- */
- public static function getActions()
- {
- // Log usage of deprecated function
- JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
- // Get list of actions
- $result = JHelperContent::getActions('com_installer');
-
- return $result;
- }
-
/**
* Get a list of filter options for the application clients.
*
diff --git a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
deleted file mode 100644
index 0ba8a22be5f9e..0000000000000
--- a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
+++ /dev/null
@@ -1,37 +0,0 @@
-getTag();
$search_ignore = $lang->getIgnoredSearchWords();
+ $ignored = false;
// Deprecated in 1.6 use $lang->getIgnoredSearchWords instead.
$ignoreFile = $lang->getLanguagePath() . '/' . $tag . '/' . $tag . '.ignore.php';
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index 498a655c10faa..dd53192116f12 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -37,24 +37,6 @@ public static function addSubmenu($vName)
);
}
- /**
- * Gets a list of the actions that can be performed.
- *
- * @return JObject
- *
- * @deprecated 3.2 Use JHelperContent::getActions() instead
- */
- public static function getActions()
- {
- // Log usage of deprecated function
- JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
- // Get list of actions
- $result = JHelperContent::getActions('com_templates');
-
- return $result;
- }
-
/**
* Get a list of filter options for the application clients.
*
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index c3a9770ca39c7..35780a46002fa 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -69,24 +69,6 @@ public static function addSubmenu($vName)
}
}
- /**
- * Gets a list of the actions that can be performed.
- *
- * @return JObject
- *
- * @deprecated 3.2 Use JHelperContent::getActions() instead
- */
- public static function getActions()
- {
- // Log usage of deprecated function
- JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
-
- // Get list of actions
- $result = JHelperContent::getActions('com_users');
-
- return $result;
- }
-
/**
* Get a list of filter options for the blocked state of a user.
*
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index 2f1471b1c5664..7a1209296898c 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -67,8 +67,8 @@ COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add "Install from Web" tab"
-COM_INSTALLER_INSTALL_FROM_WEB_INFO="Joomla! Extensions Directory™ (JED) now available with Install from Web on this page."
-COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED Terms of Service and all applicable third party license terms."
+COM_INSTALLER_INSTALL_FROM_WEB_INFO="Joomla! Extensions Directory™ (JED) now available with Install from Web on this page."
+COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED Terms of Service and all applicable third party license terms."
COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the %s language was successful."
COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
COM_INSTALLER_INSTALL_URL="Install URL"
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 4454576f0002a..237dfe939eed5 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -32,8 +32,8 @@ COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users are allo
COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin Manager.
If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration."
COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
-COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Login name when editing their profile."
-COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Login Name"
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Username when editing their profile."
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Username"
COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC="If 'Frontend User Parameters' is set to 'Show', users will be able to select their Frontend language preference when registering."
COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL="Frontend Language"
COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_DESC="The maximum number of password resets allowed within the time period. Zero indicates no limit."
diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
index 2dce7ebe6eecb..ffd44957b2ecb 100644
--- a/administrator/modules/mod_menu/tmpl/default_enabled.php
+++ b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -376,7 +376,7 @@
$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', 'class:help-docs', false, '_blank'));
$menu->addSeparator();
- $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank'));
+ $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank'));
$menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
);
diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php
index 6f44d8e056cb5..0f0350c086300 100644
--- a/administrator/templates/hathor/html/mod_menu/default_enabled.php
+++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php
@@ -348,7 +348,7 @@
$menu->addSeparator();
$menu->addChild(
- new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank')
+ new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank')
);
$menu->addChild(
new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
diff --git a/bin/index.html b/bin/index.html
deleted file mode 100644
index 2efb97f319a35..0000000000000
--- a/bin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-