Skip to content
Permalink
Browse files

Merge branch '4.0-dev' into drop_server_config_files

  • Loading branch information...
zero-24 committed Aug 23, 2019
2 parents 14a5e2c + 921913f commit 82630e37d28450dee7c5b08d60ff77c82bd0a036
Showing with 653 additions and 606 deletions.
  1. +5 −5 .drone.yml
  2. +1 −1 administrator/components/com_actionlogs/Model/ActionlogsModel.php
  3. +2 −4 administrator/components/com_associations/Field/ItemtypeField.php
  4. +1 −1 administrator/components/com_categories/Model/CategoryModel.php
  5. +1 −1 administrator/components/com_config/tmpl/application/default_filters.php
  6. +1 −1 administrator/components/com_config/tmpl/application/default_permissions.php
  7. +2 −2 administrator/components/com_config/tmpl/component/default.php
  8. +2 −4 administrator/components/com_content/Field/VoteradioField.php
  9. +1 −1 administrator/components/com_content/Model/ArticleModel.php
  10. +1 −1 administrator/components/com_content/forms/filter_articles.xml
  11. +1 −1 administrator/components/com_content/forms/filter_featured.xml
  12. +1 −1 administrator/components/com_fields/Model/FieldModel.php
  13. +1 −1 administrator/components/com_menus/Field/MenuItemByTypeField.php
  14. +6 −5 administrator/components/com_menus/forms/itemadmin_alias.xml
  15. +10 −9 administrator/components/com_menus/forms/itemadmin_component.xml
  16. +5 −4 administrator/components/com_menus/forms/itemadmin_container.xml
  17. +3 −2 administrator/components/com_menus/forms/itemadmin_heading.xml
  18. +23 −16 administrator/components/com_menus/forms/itemadmin_url.xml
  19. +2 −2 administrator/components/com_menus/presets/joomla.xml
  20. +2 −2 administrator/components/com_menus/presets/menus.xml
  21. +2 −2 administrator/components/com_menus/presets/modern.xml
  22. +2 −4 administrator/components/com_messages/Field/UserMessagesField.php
  23. +2 −4 administrator/components/com_plugins/Field/PluginorderingField.php
  24. +1 −1 administrator/components/com_privacy/Model/RequestModel.php
  25. +1 −1 administrator/components/com_users/Model/LevelModel.php
  26. +4 −5 administrator/language/en-GB/en-GB.com_installer.ini
  27. +2 −0 administrator/language/en-GB/en-GB.com_menus.ini
  28. +1 −1 administrator/language/en-GB/en-GB.lib_joomla.ini
  29. +19 −12 administrator/language/en-GB/en-GB.mod_menu.ini
  30. +1 −1 administrator/manifests/files/joomla.xml
  31. +45 −6 administrator/modules/mod_menu/tmpl/default_submenu.php
  32. +4 −3 administrator/templates/atum/error_full.php
  33. +3 −2 administrator/templates/atum/error_login.php
  34. +4 −3 administrator/templates/atum/index.php
  35. +1 −0 administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini
  36. +4 −3 administrator/templates/atum/login.php
  37. +2 −0 administrator/templates/atum/scss/blocks/_header.scss
  38. +1 −0 administrator/templates/atum/scss/blocks/_searchtools.scss
  39. +9 −1 administrator/templates/atum/scss/blocks/_sidebar.scss
  40. +1 −1 build/media_source/com_templates/js/admin-templates-default.es6.js
  41. +6 −0 build/media_source/system/scss/fields/switcher.scss
  42. +4 −4 components/com_config/Model/FormModel.php
  43. +2 −1 components/com_content/View/Category/FeedView.php
  44. +3 −2 components/com_content/View/Featured/FeedView.php
  45. +1 −1 composer.json
  46. +70 −68 composer.lock
  47. +1 −1 installation/language/en-GB/en-GB.ini
  48. +1 −1 installation/language/en-US/en-US.ini
  49. +1 −1 installation/sql/mysql/joomla.sql
  50. +1 −1 installation/sql/postgresql/joomla.sql
  51. +12 −1 installation/src/Model/DatabaseModel.php
  52. +2 −34 installation/template/js/remove.js
  53. +0 −22 installation/tmpl/remove/default.php
  54. +1 −1 language/en-GB/en-GB.lib_joomla.ini
  55. +0 −79 layouts/joomla/form/field/accesslevel-fancy-select.php
  56. +0 −60 layouts/joomla/form/field/accesslevel.php
  57. +2 −2 libraries/cms/html/access.php
  58. +1 −1 libraries/cms/html/contentlanguage.php
  59. +1 −1 libraries/cms/html/select.php
  60. +1 −1 libraries/cms/html/tel.php
  61. +80 −46 libraries/src/Access/Access.php
  62. +48 −17 libraries/src/Application/AdministratorApplication.php
  63. +15 −5 libraries/src/Application/SiteApplication.php
  64. +10 −4 libraries/src/Form/Field/AccesslevelField.php
  65. +1 −1 libraries/src/Form/Field/ContentlanguageField.php
  66. +1 −1 libraries/src/Form/Field/EmailField.php
  67. +1 −1 libraries/src/Form/Field/FileField.php
  68. +1 −1 libraries/src/Form/Field/FrontendlanguageField.php
  69. +1 −1 libraries/src/Form/Field/LanguageField.php
  70. +1 −1 libraries/src/Form/Field/PasswordField.php
  71. +1 −1 libraries/src/Form/Field/TelephoneField.php
  72. +1 −1 libraries/src/Form/Field/UrlField.php
  73. +8 −8 libraries/src/Form/Form.php
  74. +71 −12 libraries/src/Menu/SiteMenu.php
  75. +1 −1 libraries/src/Table/Table.php
  76. +2 −0 libraries/src/Table/TableInterface.php
  77. +13 −8 libraries/src/User/User.php
  78. +3 −2 libraries/src/User/UserFactory.php
  79. +22 −11 libraries/src/User/UserHelper.php
  80. +4 −4 libraries/src/Version.php
  81. +3 −5 plugins/content/confirmconsent/fields/consentbox.php
  82. +1 −1 plugins/editors/tinymce/field/uploaddirs.php
  83. +11 −11 plugins/system/languagefilter/languagefilter.php
  84. +2 −4 plugins/system/privacyconsent/field/privacy.php
  85. +13 −4 plugins/system/remember/remember.php
  86. +46 −55 plugins/system/updatenotification/updatenotification.php
  87. +2 −4 plugins/user/terms/field/terms.php
@@ -56,29 +56,29 @@ steps:

- name: php72-unit
depends_on: [ phpcs ]
image: php:7.2
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php73-unit
depends_on: [ phpcs ]
image: php:7.3
image: joomlaprojects/docker-images:php7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php74-unit
depends_on: [ phpcs ]
image: phpdaily/php:7.4-dev
image: joomlaprojects/docker-images:php7.4
failure: ignore
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php80-unit
depends_on: [ phpcs ]
image: phpdaily/php:8.0-dev
image: joomlaprojects/docker-images:php8.0
failure: ignore
commands:
- php -v
@@ -270,6 +270,6 @@ services:

---
kind: signature
hmac: af5f0783363fae3f8876585fff87e08dd470ee9a81599f20e4c0e8d2d0836801
hmac: 9462caf361ab517c63d66d10ba0c934ead624ecf116828ab71ddc889f1b0a137

...
@@ -426,7 +426,7 @@ public function getFilterForm($data = array(), $loadData = true)
// Add ip sort options to sort dropdown
if ($form && $ipLogging)
{
/* @var JFormFieldList $field */
/* @var \Joomla\CMS\Form\Field\ListField $field */
$field = $form->getField('fullordering', 'list');
$field->addOption(Text::_('COM_ACTIONLOGS_IP_ADDRESS_ASC'), array('value' => 'a.ip_address ASC'));
$field->addOption(Text::_('COM_ACTIONLOGS_IP_ADDRESS_DESC'), array('value' => 'a.ip_address DESC'));
@@ -11,18 +11,16 @@
defined('JPATH_BASE') or die;
use Joomla\CMS\Form\FormHelper;
use Joomla\CMS\Form\Field\GroupedlistField;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
FormHelper::loadFieldClass('groupedlist');
/**
* A drop down containing all component item types that implement associations.
*
* @since 3.7.0
*/
class ItemtypeField extends \JFormFieldGroupedList
class ItemtypeField extends GroupedlistField
{
/**
* The form field type.
@@ -384,7 +384,7 @@ protected function loadFormData()
*
* @return mixed
*
* @see \JFormField
* @see \Joomla\CMS\Form\FormField
* @since 1.6
* @throws \Exception if there is an error in the form event.
*/
@@ -14,6 +14,6 @@
$this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
$this->fieldsname = 'filters';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-grid-form options-grid-form-full';
echo LayoutHelper::render('joomla.content.text_filters', $this);
@@ -15,7 +15,7 @@
$this->name = Text::_('COM_CONFIG_PERMISSION_SETTINGS');
$this->description = '';
$this->fieldsname = 'permissions';
$this->formclass = 'form-no-margin options-grid-form options-grid-form-half';
$this->formclass = 'form-no-margin options-grid-form options-grid-form-full';
$this->showlabel = false;
echo LayoutHelper::render('joomla.content.options_default', $this);
@@ -85,7 +85,7 @@
?>

<?php if (!$isGrandchild && $hasParent) : ?>
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<div>
<?php elseif (!$hasParent) : ?>
@@ -106,7 +106,7 @@

<?php if (!$hasChildren) : ?>

<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<div>
<?php $opentab = 2; ?>
@@ -11,17 +11,15 @@
defined('_JEXEC') or die;
use Joomla\CMS\Form\FormHelper;
use Joomla\CMS\Form\Field\RadioField;
use Joomla\CMS\Plugin\PluginHelper;
FormHelper::loadFieldClass('radio');
/**
* Voteradio Field class.
*
* @since 3.8.0
*/
class VoteradioField extends \JFormFieldRadio
class VoteradioField extends RadioField
{
/**
* The form field type.
@@ -724,7 +724,7 @@ protected function loadFormData()
*
* @return array|boolean Array of filtered data if valid, false otherwise.
*
* @see JFormRule
* @see \Joomla\CMS\Form\FormRule
* @see JFilterInput
* @since 3.7.0
*/
@@ -56,7 +56,7 @@
type="accesslevel"
label="JOPTION_SELECT_ACCESS"
multiple="true"
layout="joomla.form.field.accesslevel-fancy-select"
layout="joomla.form.field.list-fancy-select"
hint="JOPTION_SELECT_ACCESS"
onchange="this.form.submit();"
/>
@@ -46,7 +46,7 @@
type="accesslevel"
label="JOPTION_SELECT_ACCESS"
multiple="true"
layout="joomla.form.field.accesslevel-fancy-select"
layout="joomla.form.field.list-fancy-select"
hint="JOPTION_SELECT_ACCESS"
onchange="this.form.submit();"
/>
@@ -904,7 +904,7 @@ protected function loadFormData()
*
* @return void
*
* @see \JFormField
* @see \Joomla\CMS\Form\FormField
* @since 3.7.0
* @throws \Exception if there is an error in the form event.
*/
@@ -140,7 +140,7 @@ public function __set($name, $value)
*
* @return boolean True on success.
*
* @see JFormField::setup()
* @see \Joomla\CMS\Form\FormField::setup()
* @since 3.8.0
*/
public function setup(\SimpleXMLElement $element, $value, $group = null)
@@ -29,9 +29,10 @@
/>

<field
name="menu-anchor_css"
name="menu_icon"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
/>

<field
@@ -40,9 +41,9 @@
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
/>

<field
<field
name="menu_image_css"
type="text"
type="text"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
/>

@@ -51,7 +52,7 @@
type="radio"
label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
class="switcher"
default="1"
default="1"
filter="integer"
>
<option value="0">JNO</option>
@@ -6,36 +6,37 @@
class="options-grid-form-half"
>

<field
name="menu-anchor_title"
<field
name="menu-anchor_title"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
/>

<field
name="menu-anchor_css"
name="menu_icon"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
/>

<field
name="menu_image"
<field
name="menu_image"
type="media"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
/>

<field
name="menu_image_css"
type="text"
type="text"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
/>

<field
<field
name="menu_text"
type="radio"
label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
class="switcher"
default="1"
default="1"
filter="integer"
>
<option value="0">JNO</option>
@@ -26,9 +26,10 @@
/>

<field
name="menu-anchor_css"
name="menu_icon"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
/>

<field
@@ -37,9 +38,9 @@
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
/>

<field
<field
name="menu_image_css"
type="text"
type="text"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
/>

@@ -26,9 +26,10 @@
/>

<field
name="menu-anchor_css"
name="menu_icon"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
/>

<field
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fields name="params">
<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
<field
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field
name="menu-anchor_title"
type="text"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
class="options-grid-form-half"
/>

<field
name="menu-anchor_css"
type="text"
label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
/>

<field
name="menu-anchor_rel"
<field
name="menu-anchor_rel"
type="list"
label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
default=""
@@ -36,19 +32,30 @@
<option value="tag"/>
</field>

<field
name="menu_image"
<field
name="menu_icon"
type="text"
label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
/>

<field
type="spacer"
/>

<field
name="menu_image"
type="media"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
/>

<field
name="menu_image_css"
type="text"
type="text"
label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
/>

<field
<field
name="menu_text"
type="radio"
label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
@@ -134,11 +134,11 @@
type="separator"
title="JSITE"
hidden="false"
sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', l.lang_code) END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
sql_from="#__menu_types AS a"
sql_where="a.client_id = 0"
sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
sql_group="a.id, a.title, a.menutype, m.language, l.image"
sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
sql_order="a.id DESC"
>
<menuitem
@@ -36,11 +36,11 @@
title="JSITE"
icon="desktop"
hidden="false"
sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', l.lang_code) END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
sql_from="#__menu_types AS a"
sql_where="a.client_id = 0"
sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
sql_group="a.id, a.title, a.menutype, m.language, l.image"
sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
sql_order="a.id DESC"
sql_target="self"
>

0 comments on commit 82630e3

Please sign in to comment.
You can’t perform that action at this time.