diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index 384284e02..3d4ff8f71 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -1,6 +1,6 @@ diff --git a/templates/application/display-block/block-chart/layout.js.twig b/templates/application/display-block/block-chart/layout.js.twig index 663fbfd3a..f28aac24e 100644 --- a/templates/application/display-block/block-chart/layout.js.twig +++ b/templates/application/display-block/block-chart/layout.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} $.post('{{ oUIBlock.sUrl|escape('js') }}', {}, function (data) { diff --git a/templates/application/display-block/block-csv/layout.html.twig b/templates/application/display-block/block-csv/layout.html.twig index b55161aee..a1f28fb8a 100644 --- a/templates/application/display-block/block-csv/layout.html.twig +++ b/templates/application/display-block/block-csv/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %}
diff --git a/templates/application/display-block/block-csv/layout.js.twig b/templates/application/display-block/block-csv/layout.js.twig index 03ade45ff..452973175 100644 --- a/templates/application/display-block/block-csv/layout.js.twig +++ b/templates/application/display-block/block-csv/layout.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} $.post( diff --git a/templates/application/display-block/block-list/layout.html.twig b/templates/application/display-block/block-list/layout.html.twig index a46543d99..b4a905bc1 100644 --- a/templates/application/display-block/block-list/layout.html.twig +++ b/templates/application/display-block/block-list/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/application/display-block/block-list/layout.js.twig b/templates/application/display-block/block-list/layout.js.twig index 144386317..01022cab6 100644 --- a/templates/application/display-block/block-list/layout.js.twig +++ b/templates/application/display-block/block-list/layout.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} {% if oUIBlock.sEventAttachedData is not empty %} diff --git a/templates/application/links/indirect/block-indirect-links-edit/layout.ready.js.twig b/templates/application/links/indirect/block-indirect-links-edit/layout.ready.js.twig index 742ff6d06..a68853ddc 100644 --- a/templates/application/links/indirect/block-indirect-links-edit/layout.ready.js.twig +++ b/templates/application/links/indirect/block-indirect-links-edit/layout.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} oWidget{{ oUIBlock.iInputId }} = new LinksWidget( diff --git a/templates/application/links/indirect/block-object-picker-dialog/layout.ready.js.twig b/templates/application/links/indirect/block-object-picker-dialog/layout.ready.js.twig index cbc3cf6b3..528ae11cb 100644 --- a/templates/application/links/indirect/block-object-picker-dialog/layout.ready.js.twig +++ b/templates/application/links/indirect/block-object-picker-dialog/layout.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/application/preferences/block-shortcuts/layout.js.twig b/templates/application/preferences/block-shortcuts/layout.js.twig index aaa51529b..9c1581745 100644 --- a/templates/application/preferences/block-shortcuts/layout.js.twig +++ b/templates/application/preferences/block-shortcuts/layout.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/application/printable/block-print-header/layout.html.twig b/templates/application/printable/block-print-header/layout.html.twig index 80938d5a0..20dc8c628 100644 --- a/templates/application/printable/block-print-header/layout.html.twig +++ b/templates/application/printable/block-print-header/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/application/printable/block-print-header/layout.live.js.twig b/templates/application/printable/block-print-header/layout.live.js.twig index 41e14bd5e..9323ebffd 100644 --- a/templates/application/printable/block-print-header/layout.live.js.twig +++ b/templates/application/printable/block-print-header/layout.live.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/application/printable/block-print-header/layout.ready.js.twig b/templates/application/printable/block-print-header/layout.ready.js.twig index 416622bf1..126f79dac 100644 --- a/templates/application/printable/block-print-header/layout.ready.js.twig +++ b/templates/application/printable/block-print-header/layout.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/base/components/badge/layout.html.twig b/templates/base/components/badge/layout.html.twig index f8edb8562..9c25fc669 100644 --- a/templates/base/components/badge/layout.html.twig +++ b/templates/base/components/badge/layout.html.twig @@ -1,3 +1,3 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% extends "base/layouts/content-block/layout.html.twig" %} \ No newline at end of file diff --git a/templates/base/components/dashlet/dashlet-badge.html.twig b/templates/base/components/dashlet/dashlet-badge.html.twig index 0cadee409..cd8cf145b 100644 --- a/templates/base/components/dashlet/dashlet-badge.html.twig +++ b/templates/base/components/dashlet/dashlet-badge.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %}
diff --git a/templates/base/components/dashlet/layout.html.twig b/templates/base/components/dashlet/layout.html.twig index 69b8087c9..77cefd20e 100644 --- a/templates/base/components/dashlet/layout.html.twig +++ b/templates/base/components/dashlet/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig index adf1873ea..d944e2553 100644 --- a/templates/base/components/datatable/layout.ready.js.twig +++ b/templates/base/components/datatable/layout.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% set sListId = oUIBlock.GetOption('sListId') %} {% if oUIBlock.GetOption("iPageSize") is not empty %} diff --git a/templates/base/components/datatable/static/formtable/layout.html.twig b/templates/base/components/datatable/static/formtable/layout.html.twig index a6c60c225..526e00adb 100644 --- a/templates/base/components/datatable/static/formtable/layout.html.twig +++ b/templates/base/components/datatable/static/formtable/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} diff --git a/templates/base/components/datatable/static/formtablerow/layout.html.twig b/templates/base/components/datatable/static/formtablerow/layout.html.twig index 609a3e624..a4c0d91b3 100644 --- a/templates/base/components/datatable/static/formtablerow/layout.html.twig +++ b/templates/base/components/datatable/static/formtablerow/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} diff --git a/templates/base/components/datatable/static/layout.html.twig b/templates/base/components/datatable/static/layout.html.twig index 43e8a0d4e..04e317a0d 100644 --- a/templates/base/components/datatable/static/layout.html.twig +++ b/templates/base/components/datatable/static/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% set columns = oUIBlock.GetColumns() %} diff --git a/templates/base/components/datatable/static/layout.ready.js.twig b/templates/base/components/datatable/static/layout.ready.js.twig index 883754b3a..98ce668ea 100644 --- a/templates/base/components/datatable/static/layout.ready.js.twig +++ b/templates/base/components/datatable/static/layout.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% if oUIBlock.GetOption("iPageSize") is not empty %} diff --git a/templates/base/components/input/select/select.html.twig b/templates/base/components/input/select/select.html.twig index c4818eb5a..1a39c0521 100644 --- a/templates/base/components/input/select/select.html.twig +++ b/templates/base/components/input/select/select.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% extends "base/components/input/layout.html.twig" %} {% block iboInput %} diff --git a/templates/base/components/input/select/selectoption.html.twig b/templates/base/components/input/select/selectoption.html.twig index 8e4aa7255..e04271309 100644 --- a/templates/base/components/input/select/selectoption.html.twig +++ b/templates/base/components/input/select/selectoption.html.twig @@ -1,3 +1,3 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} diff --git a/templates/base/components/panel/layout.html.twig b/templates/base/components/panel/layout.html.twig index 177ad7b6b..90a0330de 100644 --- a/templates/base/components/panel/layout.html.twig +++ b/templates/base/components/panel/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %}
{% for oSubBlock in oUIBlock.GetSubBlocks() %} diff --git a/templates/base/layouts/multi-column/layout.html.twig b/templates/base/layouts/multi-column/layout.html.twig index 440076158..ad3983358 100644 --- a/templates/base/layouts/multi-column/layout.html.twig +++ b/templates/base/layouts/multi-column/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #}
{% for oSubBlock in oUIBlock.GetSubBlocks() %} diff --git a/templates/base/layouts/object/object-details/layout.html.twig b/templates/base/layouts/object/object-details/layout.html.twig index 53f33ab4a..c3933a216 100644 --- a/templates/base/layouts/object/object-details/layout.html.twig +++ b/templates/base/layouts/object/object-details/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% extends 'base/components/panel/layout.html.twig' %} diff --git a/templates/base/layouts/page-content/with-side-content.ready.js.twig b/templates/base/layouts/page-content/with-side-content.ready.js.twig index 907ba0fa1..42f0299fd 100644 --- a/templates/base/layouts/page-content/with-side-content.ready.js.twig +++ b/templates/base/layouts/page-content/with-side-content.ready.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% if aPage.isPrintable %} oHiddeableChapters['ibo-side-content'] = '{{ 'UI:Layout:ActivityPanel:Tab:Activity:Title'|dict_s }}'; diff --git a/templates/base/layouts/tab-container/layout.html.twig b/templates/base/layouts/tab-container/layout.html.twig index eefef2995..45f6abc2e 100644 --- a/templates/base/layouts/tab-container/layout.html.twig +++ b/templates/base/layouts/tab-container/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #}
diff --git a/templates/base/layouts/tab-container/layout.js.twig b/templates/base/layouts/tab-container/layout.js.twig index dc51e0cf6..75dd81cc6 100644 --- a/templates/base/layouts/tab-container/layout.js.twig +++ b/templates/base/layouts/tab-container/layout.js.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% if not aPage.isPrintable %} diff --git a/templates/base/layouts/tab-container/tab/layout.html.twig b/templates/base/layouts/tab-container/tab/layout.html.twig index b264adb70..ae767230f 100644 --- a/templates/base/layouts/tab-container/tab/layout.html.twig +++ b/templates/base/layouts/tab-container/tab/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #}
{% block iboContentBlockContainer %} diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig index 82c1fd51d..7187a8361 100644 --- a/templates/pages/backoffice/ajaxpage/layout.html.twig +++ b/templates/pages/backoffice/ajaxpage/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} {% if bEscapeContent %} diff --git a/templates/pages/backoffice/extension-blocks/banner.html.twig b/templates/pages/backoffice/extension-blocks/banner.html.twig index cd4c48fd1..468ce33c7 100644 --- a/templates/pages/backoffice/extension-blocks/banner.html.twig +++ b/templates/pages/backoffice/extension-blocks/banner.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %}
diff --git a/templates/pages/backoffice/extension-blocks/footer.html.twig b/templates/pages/backoffice/extension-blocks/footer.html.twig index ab8cb9de0..d370a14e3 100644 --- a/templates/pages/backoffice/extension-blocks/footer.html.twig +++ b/templates/pages/backoffice/extension-blocks/footer.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} diff --git a/templates/pages/backoffice/extension-blocks/header.html.twig b/templates/pages/backoffice/extension-blocks/header.html.twig index e4bf276f8..ef7af7215 100644 --- a/templates/pages/backoffice/extension-blocks/header.html.twig +++ b/templates/pages/backoffice/extension-blocks/header.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %}
diff --git a/templates/pages/backoffice/itopwebpage/layout.html.twig b/templates/pages/backoffice/itopwebpage/layout.html.twig index 599f83654..32c233c33 100644 --- a/templates/pages/backoffice/itopwebpage/layout.html.twig +++ b/templates/pages/backoffice/itopwebpage/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% extends "pages/backoffice/nicewebpage/layout.html.twig" %} {% block iboPageBodyHtml %} diff --git a/templates/pages/backoffice/nicewebpage/layout.html.twig b/templates/pages/backoffice/nicewebpage/layout.html.twig index 1f3e51135..bca194f1f 100644 --- a/templates/pages/backoffice/nicewebpage/layout.html.twig +++ b/templates/pages/backoffice/nicewebpage/layout.html.twig @@ -1,3 +1,3 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% extends "pages/backoffice/webpage/layout.html.twig" %} \ No newline at end of file diff --git a/templates/pages/backoffice/webpage/layout.html.twig b/templates/pages/backoffice/webpage/layout.html.twig index 1e42929bc..63e7620d6 100644 --- a/templates/pages/backoffice/webpage/layout.html.twig +++ b/templates/pages/backoffice/webpage/layout.html.twig @@ -1,4 +1,4 @@ -{# @copyright Copyright (C) 2010-2020 Combodo SARL #} +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} diff --git a/test/VisualTest/Backoffice/RenderAllUiBlocks.php b/test/VisualTest/Backoffice/RenderAllUiBlocks.php index 350617677..63fd3a692 100644 --- a/test/VisualTest/Backoffice/RenderAllUiBlocks.php +++ b/test/VisualTest/Backoffice/RenderAllUiBlocks.php @@ -3,7 +3,7 @@ /** @noinspection PhpUnhandledExceptionInspection */ /* - * Copyright (C) 2013-2020 Combodo SARL + * Copyright (C) 2013-2021 Combodo SARL * * This file is part of iTop. * diff --git a/test/application/DashboardLayoutTest.php b/test/application/DashboardLayoutTest.php index 0d6eb2397..01cbe9feb 100644 --- a/test/application/DashboardLayoutTest.php +++ b/test/application/DashboardLayoutTest.php @@ -1,6 +1,6 @@