Skip to content
Permalink
Browse files

update branch and fix merge conflichts

  • Loading branch information...
zero-24 committed Jul 31, 2019
2 parents c215e9e + 99e4fa0 commit 944f5db704bd80767def6046b1bdc222421254da
Showing with 1,799 additions and 980 deletions.
  1. +0 −1 README.md
  2. +1 −2 README.txt
  3. +1 −1 administrator/components/com_admin/services/provider.php
  4. +1 −1 administrator/components/com_associations/layouts/joomla/searchtools/default.php
  5. +1 −3 administrator/components/com_banners/Service/Html/Banner.php
  6. +1 −1 administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
  7. +0 −14 administrator/components/com_categories/tmpl/category/edit_metadata.php
  8. +0 −14 administrator/components/com_categories/tmpl/category/modal_associations.php
  9. +0 −10 administrator/components/com_categories/tmpl/category/modal_extrafields.php
  10. +0 −14 administrator/components/com_categories/tmpl/category/modal_metadata.php
  11. +0 −51 administrator/components/com_categories/tmpl/category/modal_options.php
  12. +2 −1 administrator/components/com_contact/forms/contact.xml
  13. +0 −14 administrator/components/com_contact/tmpl/contact/edit_metadata.php
  14. +0 −31 administrator/components/com_contact/tmpl/contact/edit_params.php
  15. +0 −14 administrator/components/com_contact/tmpl/contact/modal_associations.php
  16. +0 −14 administrator/components/com_contact/tmpl/contact/modal_metadata.php
  17. +0 −31 administrator/components/com_contact/tmpl/contact/modal_params.php
  18. +2 −2 administrator/components/com_content/forms/filter_articles.xml
  19. +0 −14 administrator/components/com_content/tmpl/article/edit_metadata.php
  20. +0 −14 administrator/components/com_content/tmpl/article/modal_associations.php
  21. +0 −14 administrator/components/com_content/tmpl/article/modal_metadata.php
  22. +10 −10 administrator/components/com_content/tmpl/articles/default.php
  23. +0 −48 administrator/components/com_fields/tmpl/field/modal_options.php
  24. +1 −3 administrator/components/com_installer/tmpl/manage/default.php
  25. +1 −1 administrator/components/com_languages/layouts/joomla/searchtools/default.php
  26. +0 −2 administrator/components/com_languages/tmpl/languages/default.php
  27. +1 −1 administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
  28. +1 −1 administrator/components/com_menus/layouts/joomla/searchtools/default.php
  29. +0 −41 administrator/components/com_menus/tmpl/item/edit_options.php
  30. +0 −14 administrator/components/com_menus/tmpl/item/modal_associations.php
  31. +0 −48 administrator/components/com_menus/tmpl/item/modal_options.php
  32. +5 −0 administrator/components/com_menus/tmpl/menus/default.php
  33. +2 −2 administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
  34. +0 −14 administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
  35. +0 −35 administrator/components/com_newsfeeds/tmpl/newsfeed/edit_params.php
  36. +0 −14 administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
  37. +0 −15 administrator/components/com_newsfeeds/tmpl/newsfeed/modal_display.php
  38. +0 −14 administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
  39. +0 −31 administrator/components/com_newsfeeds/tmpl/newsfeed/modal_params.php
  40. +0 −54 administrator/components/com_plugins/tmpl/plugin/edit_options.php
  41. +4 −10 administrator/components/com_privacy/tmpl/capabilities/default.php
  42. +28 −30 administrator/components/com_privacy/tmpl/requests/default.php
  43. +1 −1 administrator/components/com_redirect/layouts/toolbar/batch.php
  44. +0 −33 administrator/components/com_tags/tmpl/tag/edit_metadata.php
  45. +0 −67 administrator/components/com_tags/tmpl/tag/edit_options.php
  46. +0 −43 administrator/components/com_templates/tmpl/style/edit_options.php
  47. +0 −1 administrator/language/en-GB/en-GB.com_banners.ini
  48. +1 −0 administrator/language/en-GB/en-GB.com_privacy.ini
  49. +0 −5 administrator/language/en-GB/en-GB.lib_joomla.ini
  50. +9 −9 administrator/templates/atum/joomla.asset.json
  51. +16 −0 administrator/templates/atum/scss/pages/_com_privacy.scss
  52. +1 −0 administrator/templates/atum/scss/template.scss
  53. +11 −6 build/build-modules-js/init.es6.js
  54. +1 −0 build/build.php
  55. +6 −5 build/media_source/legacy/joomla.asset.json
  56. +10 −9 build/media_source/system/joomla.asset.json
  57. +4 −3 build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
  58. +3 −7 composer.json
  59. +214 −110 composer.lock
  60. +0 −4 language/en-GB/en-GB.lib_joomla.ini
  61. +6 −4 layouts/joomla/form/field/rules.php
  62. +3 −2 layouts/joomla/html/batch/access.php
  63. +1 −1 layouts/joomla/html/batch/adminlanguage.php
  64. +3 −1 layouts/joomla/html/batch/item.php
  65. +1 −1 layouts/joomla/html/batch/language.php
  66. +2 −3 layouts/joomla/html/batch/tag.php
  67. +1 −2 layouts/joomla/html/batch/user.php
  68. +1 −1 layouts/joomla/html/batch/workflowstage.php
  69. +3 −3 libraries/cms/html/tel.php
  70. +6 −0 libraries/src/Application/ConsoleApplication.php
  71. +310 −0 libraries/src/Console/AddUserCommand.php
  72. +303 −0 libraries/src/Console/AddUserToGroupCommand.php
  73. +176 −0 libraries/src/Console/ChangeUserPasswordCommand.php
  74. +195 −0 libraries/src/Console/DeleteUserCommand.php
  75. +125 −0 libraries/src/Console/ListUserCommand.php
  76. +304 −0 libraries/src/Console/RemoveUserFromGroupCommand.php
  77. +1 −1 libraries/src/Layout/BaseLayout.php
  78. +4 −3 libraries/src/String/PunycodeHelper.php
  79. +9 −1 libraries/src/User/User.php
  80. +6 −5 templates/cassiopeia/joomla.asset.json
@@ -69,6 +69,5 @@ Do you want to improve Joomla?
Copyright
---------------------
* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
@@ -68,6 +68,5 @@

Copyright:
* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
* Distributed under the GNU General Public License version 2 or later
* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
* See License details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_content
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage Layout
* @subpackage com_associations
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
@@ -35,9 +35,7 @@ public function clients()
return implode(
"\n",
array(
'<label id="batch-client-lbl" for="batch-client" class="hasTooltip" title="'
. HTMLHelper::_('tooltipText', 'COM_BANNERS_BATCH_CLIENT_LABEL', 'COM_BANNERS_BATCH_CLIENT_LABEL_DESC')
. '">',
'<label id="batch-client-lbl" for="batch-client">',
Text::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
'</label>',
'<select class="custom-select" name="batch[client_id]" id="batch-client-id">',
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage Layout
* @subpackage com_categories
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -291,6 +291,7 @@
name="email_to"
type="email"
label="JGLOBAL_EMAIL"
validate="email"
size="30"
/>

@@ -721,7 +722,7 @@
name="linkd_name"
type="text"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
size="30"
size="30"
/>

<field

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -126,10 +126,10 @@
<option value="category_title DESC">JCATEGORY_DESC</option>
<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
<option value="a.created_by ASC">JAUTHOR_ASC</option>
<option value="a.created_by DESC">JAUTHOR_DESC</option>
<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
<option value="language ASC" requires="multilanguage">JGRID_HEADING_LANGUAGE_ASC</option>
<option value="language DESC" requires="multilanguage">JGRID_HEADING_LANGUAGE_DESC</option>
<option value="a.created ASC">JDATE_ASC</option>

This file was deleted.

This file was deleted.

This file was deleted.

@@ -126,14 +126,14 @@
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
</th>
<?php if ($assoc) : ?>
<th scope="col" style="width:5%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTENT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
</th>
<?php if (Multilanguage::isEnabled()) : ?>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
@@ -333,13 +333,6 @@
<td class="small d-none d-md-table-cell">
<?php echo $this->escape($item->access_level); ?>
</td>
<?php if ($assoc) : ?>
<td class="d-none d-md-table-cell">
<?php if ($item->association) : ?>
<?php echo HTMLHelper::_('contentadministrator.association', $item->id); ?>
<?php endif; ?>
</td>
<?php endif; ?>
<td class="small d-none d-md-table-cell">
<?php if ((int) $item->created_by != 0) : ?>
<a href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>">
@@ -352,6 +345,13 @@
<div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
<?php endif; ?>
</td>
<?php if ($assoc) : ?>
<td class="d-none d-md-table-cell">
<?php if ($item->association) : ?>
<?php echo HTMLHelper::_('contentadministrator.association', $item->id); ?>
<?php endif; ?>
</td>
<?php endif; ?>
<?php if (Multilanguage::isEnabled()) : ?>
<td class="small d-none d-md-table-cell">
<?php echo LayoutHelper::render('joomla.content.language', $item); ?>

0 comments on commit 944f5db

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