Pierre Goiffon
391c78ae42
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
# datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
# datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
# datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
# datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
# datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
2024-02-14 14:21:22 +01:00
Pierre Goiffon
bb3ab76205
N°7246 Fix dict files : missing constants in dict labels
2024-02-14 11:20:02 +01:00
Pierre Goiffon
0b1bdfff55
N°7246 Fix dict files : translated keys with tildes
...
Note that there were some keys in EN files with tildes at the end
2024-02-14 11:20:02 +01:00
Pierre Goiffon
200cdefa1a
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
# datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php
2024-01-15 15:44:48 +01:00
Pierre Goiffon
9eeb4b8751
N°7143 itop-hub-connector dic files: fix buggy br tags
2024-01-15 15:35:15 +01:00
Pierre Goiffon
b8892e9651
🔖 Prepare 3.0.4 version
2024-01-05 17:34:39 +01:00
Pierre Goiffon
379062f1f7
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
Most of the conflicts are caused by HU translations (N°7077 / #584 )
# Conflicts:
# css/setup.css
# datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
# datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
# datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
# datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
# datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
# datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
# datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
# datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php
# dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php
# dictionaries/ui/components/field/hu.dictionary.itop.field.php
# dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php
# dictionaries/ui/components/input/hu.dictionary.itop.input.php
# dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php
# dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php
# dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
# dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php
# dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php
# dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php
# dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php
# dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2024-01-03 17:30:57 +01:00
Pierre Goiffon
f84e2060be
N°7077 Hungarian translations based on iTop 3.0.2-1 ( #584 )
...
Many thanks to Csaba TARJÁNYI (@tacsaby) !
2023-12-20 15:52:41 +01:00
Pierre Goiffon
e007e09155
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# pages/ajax.render.php
2023-12-19 18:41:57 +01:00
Pierre Goiffon
4ee70cb95a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/csvpage.class.inc.php
# application/itopwebpage.class.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
# datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
# pages/ajax.document.php
# pages/ajax.render.php
# sources/application/TwigBase/Controller/Controller.php
# webservices/export-v2.php
2023-12-19 18:38:45 +01:00
Pierre Goiffon
9865bf0779
N°4368 add sending X-Content-Type-Options HTTP header
...
Replace in consumers the \WebPage::add_xframe_options call by \WebPage::add_http_headers
2023-12-19 18:25:26 +01:00
Molkobain
be699b4358
🔖 Increase version number to 3.1.1
2023-11-28 19:56:14 +01:00
Timothee
f548dc2898
Dictionaries update for 3.1 beta
2023-06-15 09:47:51 +02:00
Pierre Goiffon
881aa87ad2
N°6270 Remove empty model.*.php files
...
Not necessary anymore in 3.1.0 since :
* N°4875 - Compiler : do not force the model.*.php file to be present in the module.*.php file ('datamodel' key)
* N°4280 - Module loading : do not crash if 'datamodel' file doesn't exists (model.*.php)
2023-05-04 12:14:52 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
Thomas Casteleyn
fc97491708
N°6105 - Cleanup unnecessary use of dirname(__FILE__) ( #453 )
2023-03-14 18:51:01 +01:00
Molkobain
ac7abb3049
Prepare iTop 3.0.3 release
...
* Increase constants version to 3.0.3
* Increase modules version to 3.0.3
* Update licenses file
2023-03-14 09:55:18 +01:00
Molkobain
cd72eee6dd
N°6013 - Update hungarian translations thanks to @tacsaby
2023-02-22 14:47:10 +01:00
Thomas Casteleyn
bbea978259
N°5929 - Update hungarian translations thanks to @tacsaby ( #438 )
...
Co-authored-by: tacsaby
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-01-30 17:15:08 +01:00
Stephen Abello
9df9077595
N°4737 - Adjust progress bar position in iTop hub connector
2022-12-23 15:45:58 +01:00
Stephen Abello
756241918e
N°4737 - Adjust button position in iTop hub connector
2022-12-23 15:44:22 +01:00
Eric Espie
bb26e48d38
Update version to next release 2.7.9
2022-12-12 16:19:42 +01:00
Pierre Goiffon
6258b97b92
N°5563 Convert datamodels files with new 3.1 conversion methods
2022-11-21 09:15:23 +01:00
DudekArtur
07fc8c1e5b
N°5706 - Update polish translations thanks to @DudekArtur ! ( #357 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-08 21:06:25 +01:00
Eduardo Mozart de Oliveira
9f963686b5
N°4765 - Update brazilian translations thanks to @eduardomozart ( #268 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:20:53 +02:00
Molkobain
6e3ff0e429
Update iTop version to 3.0.2
2022-08-29 09:40:47 +02:00
Benjamin Dalsass
0a61169326
Update version to next release 2.7.8
2022-08-16 09:47:46 +02:00
acognet
ebab664c1a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-11 16:54:43 +02:00
jbostoen
d17e399a5f
🌐 N°5397 - Updated Dutch translations ( #262 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
2022-08-11 14:07:51 +02:00
acognet
7ec12f1e12
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
2022-07-01 09:22:25 +02:00
acognet
139be3a9b7
Fix display of hub connector
2022-07-01 09:05:49 +02:00
Purple Grape
0c14423213
improved Chinese translation ( #302 )
...
1. words refine
2. remove unwanted blank
3. punctuation related issue
Co-Authored-By: Devin <bdejin@hotmail.com >
2022-06-28 12:34:21 +02:00
Benjamin Dalsass
683ab25e83
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-06-17 10:14:01 +02:00
Benjamin Dalsass
4d180eb303
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.lock
# js/wizardhelper.js
# lib/composer/autoload_real.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/guzzlehttp/guzzle/CHANGELOG.md
# setup/wizardsteps.class.inc.php
2022-06-17 09:25:57 +02:00
Benjamin Dalsass
ca98066d68
N°5037 - Setup: Add disclaimer about collected data
2022-06-14 10:54:25 +02:00
acognet
1fd792fed9
N°3950 - Deprecate old unreferenced methods that are @deprecated - remove application/itopwebpage.class.inc.php
2022-05-25 11:35:54 +02:00
acognet
438b84d4ee
N°3141 - Deprecate legacy SQL build
2022-05-16 09:24:42 +02:00
acognet
6a4217e87b
N°3950 - Deprecate old unreferenced methods that are @deprecated - remove ajaxwebpage and iTopWebPage
2022-05-10 16:39:31 +02:00
Pierre Goiffon
923c3a27a3
Prepare 3.0.1 version
2022-02-08 14:28:27 +01:00
Pierre Goiffon
e14845728c
Prepare 2.7.7
2022-02-01 15:19:10 +01:00
Molkobain
3bec96abe1
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
# setup/itopdesignformat.class.inc.php
2022-01-27 16:09:22 +01:00
Molkobain
cc5f7608e3
N°3861 - Dictionaries: Replace usages of hardcoded "iTop" string by ITOP_APPLICATION_SHORT constant
2022-01-26 10:28:47 +01:00
acognet
17e8c53236
demove deprecated functions : replace ajax_page by AjaxPage
2022-01-21 11:52:02 +01:00
Molkobain
812606db78
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
2022-01-12 15:54:18 +01:00
acognet
24e6840a8b
N°4647 - Dictionaries for Polish not up to date
2022-01-10 18:07:30 +01:00
acognet
c1e2ba8abc
Change version number to 3.1.0
2021-12-23 17:05:54 +01:00
acognet
d301562ffe
Change version number to 3.1.0
2021-12-23 09:41:16 +01:00
Pierre Goiffon
b190d0e385
Prepare 2.7.6 version
2021-12-14 16:54:42 +01:00
Pierre Goiffon
f57785e422
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.ui.php
# test/integration/DictionariesConsistencyTest.php
2021-11-22 09:08:34 +01:00
Pierre Goiffon
77880c3675
🌐 N°3635 ES dict : change 'Español, Castellaño' to 'Español, Castellano'
2021-11-22 08:55:08 +01:00