Pierre Goiffon
|
f63aceeabe
|
Merge remote-tracking branch 'origin/support/2.5'
# Conflicts:
# datamodels/2.x/authent-external/da.dict.authent-external.php
# datamodels/2.x/authent-external/de.dict.authent-external.php
# datamodels/2.x/authent-external/fr.dict.authent-external.php
# datamodels/2.x/authent-external/hu.dict.authent-external.php
# datamodels/2.x/authent-external/ja.dict.authent-external.php
# datamodels/2.x/authent-external/nl.dict.authent-external.php
# datamodels/2.x/authent-external/pt_br.dict.authent-external.php
# datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
# datamodels/2.x/authent-ldap/cs.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/da.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/de.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/hu.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/ja.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/pt_br.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/ru.dict.authent-ldap.php
# datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
# datamodels/2.x/authent-local/da.dict.authent-local.php
# datamodels/2.x/authent-local/de.dict.authent-local.php
# datamodels/2.x/authent-local/fr.dict.authent-local.php
# datamodels/2.x/authent-local/hu.dict.authent-local.php
# datamodels/2.x/authent-local/ja.dict.authent-local.php
# datamodels/2.x/authent-local/nl.dict.authent-local.php
# datamodels/2.x/authent-local/pt_br.dict.authent-local.php
# datamodels/2.x/authent-local/ru.dict.authent-local.php
# datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
# datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/da.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/de.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/it.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php
# datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-backup/da.dict.itop-backup.php
# datamodels/2.x/itop-backup/de.dict.itop-backup.php
# datamodels/2.x/itop-backup/es_cr.dict.itop-backup.php
# datamodels/2.x/itop-backup/hu.dict.itop-backup.php
# datamodels/2.x/itop-backup/it.dict.itop-backup.php
# datamodels/2.x/itop-backup/ja.dict.itop-backup.php
# datamodels/2.x/itop-backup/nl.dict.itop-backup.php
# datamodels/2.x/itop-backup/tr.dict.itop-backup.php
# datamodels/2.x/itop-change-mgmt-itil/da.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/de.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/hu.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/ja.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/ru.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/da.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/de.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/fr.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/hu.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/it.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/ja.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/ru.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/tr.dict.itop-change-mgmt.php
# datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/da.dict.itop-config.php
# datamodels/2.x/itop-config/de.dict.itop-config.php
# datamodels/2.x/itop-config/es_cr.dict.itop-config.php
# datamodels/2.x/itop-config/fr.dict.itop-config.php
# datamodels/2.x/itop-config/hu.dict.itop-config.php
# datamodels/2.x/itop-config/it.dict.itop-config.php
# datamodels/2.x/itop-config/ja.dict.itop-config.php
# datamodels/2.x/itop-config/nl.dict.itop-config.php
# datamodels/2.x/itop-config/pt_br.dict.itop-config.php
# datamodels/2.x/itop-config/tr.dict.itop-config.php
# datamodels/2.x/itop-datacenter-mgmt/cs.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/da.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/de.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/es_cr.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/fr.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/hu.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/it.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/ja.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/nl.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/pt_br.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/ru.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/tr.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/cs.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/da.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/de.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/es_cr.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/fr.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/hu.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/it.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/ja.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/nl.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/pt_br.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/ru.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/tr.dict.itop-endusers-devices.php
# datamodels/2.x/itop-endusers-devices/zh_cn.dict.itop-endusers-devices.php
# datamodels/2.x/itop-hub-connector/cs.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/da.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/de.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/fr.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/hu.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/it.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/ja.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/pt_br.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/ru.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/tr.dict.itop-hub-connector.php
# datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/cs.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/da.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/de.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/es_cr.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/hu.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/it.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/ja.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/ru.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/tr.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/cs.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/da.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/hu.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/ja.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/da.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/hu.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/it.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/ja.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/tr.dict.itop-portal-base.php
# datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
# datamodels/2.x/itop-problem-mgmt/da.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/de.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/hu.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/ja.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/ru.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/cs.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/da.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/de.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/hu.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/it.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/ja.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/ru.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/tr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/cs.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/da.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/de.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/hu.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/it.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/ja.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/ru.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/tr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/cs.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/da.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/hu.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/it.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/ru.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/tr.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/cs.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/da.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/hu.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/nl.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/cs.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/da.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/de.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/fr.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/hu.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/it.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/ja.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/nl.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/pt_br.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/ru.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/tr.dict.itop-sla-computation.php
# datamodels/2.x/itop-sla-computation/zh_cn.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/cs.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/da.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/de.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/fr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/hu.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/it.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/ja.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/nl.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/pt_br.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/ru.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/tr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-storage-mgmt/zh_cn.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/da.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/de.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/cs.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/da.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/de.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/fr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/hu.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/it.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/ja.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/nl.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/pt_br.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/ru.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/tr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-virtualization-mgmt/zh_cn.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/cs.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/da.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/de.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/hu.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/it.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/ja.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/nl.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/pt_br.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/ru.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.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.core.php
# dictionaries/nl.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/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
|
2019-03-19 10:54:06 +01:00 |
|
Pierre Goiffon
|
3fb0c768e6
|
🌐 Update dictionnaries for iTop 2.5.2
|
2019-03-19 10:10:28 +01:00 |
|
Eric
|
1d8addf675
|
typo
|
2019-03-06 18:21:19 +01:00 |
|
Eric
|
c8c3d32b18
|
Error logs and corresponding eml stored by message and accessible from the console
|
2019-03-06 17:46:47 +01:00 |
|
Pierre Goiffon
|
065895aa73
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
|
2019-03-04 09:21:14 +01:00 |
|
Eric
|
ebe026b2e9
|
N°1966 - Missing dictionaries entries (other languages)
|
2019-02-25 17:20:47 +01:00 |
|
Pierre Goiffon
|
e59e62fb1b
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# core/expressioncache.class.inc.php
|
2019-02-21 17:24:37 +01:00 |
|
Pierre Goiffon
|
1f7923beae
|
Merge remote-tracking branch 'origin/support/2.5'
# Conflicts:
# datamodels/2.x/itop-backup/module.itop-backup.php
# setup/setup.js
# setup/wizardsteps.class.inc.php
|
2019-02-21 17:18:29 +01:00 |
|
Pierre Goiffon
|
23ec21e494
|
N°2031 backup : now logs using IssueLog, and remove debug config property
|
2019-02-19 14:46:44 +01:00 |
|
Eric
|
acf80b4b92
|
Merge branch 'master' into develop
|
2019-02-15 17:44:59 +01:00 |
|
Eric
|
7bb49893ee
|
N°1884 - Admin Tools Manager no longer has access to 'Schedule Backup' and 'Configuration' menus
|
2019-02-15 17:34:38 +01:00 |
|
Eric
|
bf62b63173
|
N°1884 - Admin Tools Manager no longer has access to 'Schedule Backup' and 'Configuration' menus
|
2019-02-15 17:33:47 +01:00 |
|
Eric
|
b8fb1fa78a
|
N°1884 - Admin Tools Manager no longer has access to 'Schedule Backup' and 'Configuration' menus
(cherry picked from commit 818b4d08da)
|
2019-02-15 17:31:37 +01:00 |
|
Eric
|
818b4d08da
|
N°1884 - Admin Tools Manager no longer has access to 'Schedule Backup' and 'Configuration' menus
|
2019-02-15 17:28:55 +01:00 |
|
Pierre Goiffon
|
3ff6374ace
|
Merge branch 'master' into develop
|
2019-01-28 16:04:44 +01:00 |
|
Pierre Goiffon
|
505aad1e89
|
Merge branch 'support/2.5'
# Conflicts:
# datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
# lib/tcpdf/CHANGELOG.TXT
# lib/tcpdf/composer.json
# lib/tcpdf/include/tcpdf_fonts.php
# lib/tcpdf/include/tcpdf_images.php
# lib/tcpdf/include/tcpdf_static.php
# lib/tcpdf/tcpdf.php
|
2019-01-28 16:04:19 +01:00 |
|
Stephen Abello
|
dfe81f6272
|
N°1935: Security hardening
|
2019-01-14 11:54:46 +01:00 |
|
purplegrape
|
1df19f65c4
|
small translation improvement for chinese
1 symbols should not be translated
2 small improvement
|
2019-01-11 17:31:36 +01:00 |
|
Pierre Goiffon
|
effaba42d0
|
Merge remote-tracking branch 'origin/support/2.5' into release/2.6
|
2019-01-09 17:24:54 +01:00 |
|
Stephen Abello
|
0bce9c78ea
|
N°1935: Security hardening
|
2019-01-09 14:23:15 +01:00 |
|
Pierre Goiffon
|
50235bbb04
|
🌐 Fix typos in EN translations
Report PR #38 modifications, many thanks @jbostoen !
|
2018-12-20 17:19:32 +01:00 |
|
Purple Grape
|
bc4873dfe5
|
🌐 update 2.6 chinese translation and corresponding licences (#45)
* Update zh_cn.dict.authent-external.php
* Update zh_cn.dict.authent-ldap.php
* Update zh_cn.dict.authent-local.php
* Update zh_cn.dict.itop-attachments.php
* Update zh_cn.dict.itop-backup.php
* Update zh_cn.dict.itop-change-mgmt-itil.php
* Update zh_cn.dict.itop-change-mgmt.php
* Update zh_cn.dict.itop-config-mgmt.php
* Update zh_cn.dict.itop-config.php
* Update zh_cn.dict.itop-datacenter-mgmt.php
* Update zh.dict.itop-endusers-devices.php
* Update zh_cn.dict.itop-hub-connector.php
* Update zh_cn.dict.itop-incident-mgmt-itil.php
* Update zh_cn.dict.itop-knownerror-mgmt.php
* Update zh_cn.dict.itop-portal-base.php
* Update zh_cn.dict.itop-portal-base.php
* Update zh_cn.dict.itop-problem-mgmt.php
* Update zh_cn.dict.itop-request-mgmt-itil.php
* Update zh_cn.dict.itop-request-mgmt.php
* Update zh_cn.dict.itop-welcome-itil.php
* Update zh_cn.dict.itop-tickets.php
* Update zh_cn.dict.itop-service-mgmt-provider.php
* Update zh_cn.dict.itop-service-mgmt.php
* Update zh_cn.dictionary.itop.core.php
* Update zh_cn.dictionary.itop.ui.php
|
2018-12-18 18:11:20 +01:00 |
|
Pierre Goiffon
|
4d3810a10d
|
🌐 New Dutch translations
Integrated directly from PR #38 as rebase and squash seems very difficult
Many thanks @jbostoen and @Hipska !
|
2018-12-18 15:10:38 +01:00 |
|
Pierre Goiffon
|
b880ca05a5
|
Merge remote-tracking branch 'origin/support/2.5' into release/2.6
# Conflicts:
# composer.json
# setup/setuputils.class.inc.php
|
2018-12-17 17:04:39 +01:00 |
|
“purplegrape”
|
9828b905b2
|
rename chinese translation file from zh.dict*php to zh_cn.dict*php .
in case guys from HongKong ,TaiWan or Singapore wana have their own translations.
|
2018-12-17 11:16:25 +01:00 |
|
Pierre Goiffon
|
80a8f7a888
|
Update translation files
|
2018-12-10 08:46:02 +01:00 |
|
Pierre Goiffon
|
7f497fe3be
|
Merge remote-tracking branch 'origin/support/2.5' into release/2.6
# Conflicts:
# datamodels/2.x/itop-attachments/zh.dict.itop-attachments.php
# datamodels/2.x/itop-backup/zh.dict.itop-backup.php
# datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/zh.dict.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
# datamodels/2.x/itop-config/zh.dict.itop-config.php
# datamodels/2.x/itop-datacenter-mgmt/zh.dict.itop-datacenter-mgmt.php
# datamodels/2.x/itop-hub-connector/zh.dict.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/zh.dict.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/zh.dict.itop-portal-base.php
# datamodels/2.x/itop-problem-mgmt/es_cr.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
# datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt-itil/zh.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-request-mgmt/zh.dict.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/zh.dict.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php
# dictionaries/zh.dictionary.itop.core.php
# dictionaries/zh.dictionary.itop.ui.php
|
2018-12-10 08:38:19 +01:00 |
|
Molkobain
|
56b4ecb4ce
|
🌐 Update spanish translations (thanks to Miguel Turrubiates! ✌)
|
2018-12-07 14:25:17 +01:00 |
|
Purple Grape
|
7d43ae40b8
|
Support/2.5 (#24)
* Update zh.dict.authent-ldap.php
* Update zh.dict.authent-local.php
* Create zh.dict.itop-attachments.php
* Create zh.dict.itop-backup.php
* Update zh.dict.itop-change-mgmt-itil.php
* Create zh.dict.itop-change-mgmt.php
* Update zh.dict.itop-config-mgmt.php
* Create zh.dict.itop-config.php
* Create zh.dict.itop-datacenter-mgmt.php
* Create zh.dict.itop-hub-connector.php
* Create zh.dict.itop-incident-mgmt-itil.php
* Update zh.dict.itop-knownerror-mgmt.php
* Create zh.dict.itop-portal-base.php
* Update zh.dict.itop-problem-mgmt.php
* Create zh.dict.itop-request-mgmt-itil.php
* Create zh.dict.itop-request-mgmt.php
* Create zh.dict.itop-service-mgmt-provider.php
* Update zh.dict.itop-service-mgmt.php
* Update zh.dict.itop-tickets.php
* Update zh.dict.itop-welcome-itil.php
* Update zh.dictionary.itop.ui.php
* Update zh.dictionary.itop.core.php
|
2018-12-07 10:38:50 +01:00 |
|
Pierre Goiffon
|
c6da1db72b
|
🔒 N°1802 add auth to check-backup.php
|
2018-12-05 11:37:42 +01:00 |
|
Pierre Goiffon
|
843c06b007
|
🚸 improves backup/check-backup
* backup.php now handles calls from datamodels (approot)
* fix check-backup sample cli
* better error on check-backup invalid check_ticket_itop cli parameter
|
2018-12-05 11:37:42 +01:00 |
|
Pierre Goiffon
|
7cf7628b8f
|
🔧 N°1802 update backup.params.distrib
|
2018-12-05 11:18:49 +01:00 |
|
Pierre Goiffon
|
41b096ba76
|
🔧 N°1802 rename itop_root config file parameter to itop_backup_incident
|
2018-12-05 10:45:14 +01:00 |
|
Pierre Goiffon
|
a92e2fd882
|
📦 Update datamodels versions from 2.5.0 to 2.6.0
|
2018-11-30 18:25:20 +01:00 |
|
Pierre Goiffon
|
c5d0dd05b9
|
🔒 N°1802 itop-backup : move iTop root to config file
|
2018-11-28 14:49:49 +01:00 |
|
Pierre Goiffon
|
d2505d15fe
|
🔒 N°1802 itop-backup : move iTop root to config file
|
2018-11-27 11:09:14 +01:00 |
|
Pierre Goiffon
|
5309aa225a
|
Merge remote-tracking branch 'origin/support/2.5' into release/2.6
# Conflicts:
# application/utils.inc.php
# js/dashboard.js
# pages/ajax.render.php
|
2018-11-26 18:28:42 +01:00 |
|
Pierre Goiffon
|
d5568afc68
|
🔒 N°1795 prevent XSS on some fields
|
2018-11-23 18:00:26 +01:00 |
|
Pierre Goiffon
|
44d7abac6e
|
🎨 check-backup : improve code readability
move exit conditions on top to avoid if/else nightmare
|
2018-11-23 17:58:21 +01:00 |
|
Eric
|
2e46fa50b3
|
🌐 Update dictionaries with new missing entries
|
2018-11-21 10:25:58 +01:00 |
|
Molkobain
|
6addd9acec
|
Update dictionaries for all languages to iTop 2.6
|
2018-11-02 11:52:33 +01:00 |
|
Molkobain
|
9faa4e4cbd
|
Update english dictionaries' file comment
|
2018-11-02 11:02:34 +01:00 |
|
Molkobain
|
89a21c8e44
|
Code cleanup
Remove ending "?>" from dictionary files before updating all languages.
|
2018-11-01 15:35:49 +01:00 |
|
Pierre Goiffon
|
588899db63
|
Convert all files from CrLf to Lf (preparing merge to develop)
|
2018-10-18 14:20:40 +02:00 |
|
Pierre Goiffon
|
f871581997
|
Merge branch 'develop' into feature/b931
# Conflicts:
# application/applicationextension.inc.php
# core/attributedef.class.inc.php
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# core/dbobjectsearch.class.php
# core/oql/expression.class.inc.php
# core/oql/oql-lexer.plex
# core/oql/oql-parser.y
# core/oql/oqlquery.class.inc.php
# css/light-grey.scss
# datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
# datamodels/2.x/itop-portal/datamodel.itop-portal.xml
# datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
# dictionaries/en.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.core.php
# setup/xmldataloader.class.inc.php
# test/ItopDataTestCase.php
|
2018-09-04 18:02:51 +02:00 |
|
Pierre Goiffon
|
40a4e6d7b0
|
Fix files using CrLf, convert them to Lf to have the whole repo using Lf
Warn your git config (core.autocrlf = input or true)
|
2018-09-04 17:59:51 +02:00 |
|
Pierre Goiffon
|
4df497a768
|
N°931 Increment iTop XML version (1.5 -> 1.6)
SVN:b931[6020]
|
2018-08-30 11:08:46 +02:00 |
|
Stephen Abello
|
6630051ef3
|
Updated jQuery to v3.3.1
SVN:trunk[5961]
|
2018-07-23 06:58:30 +00:00 |
|
Stephen Abello
|
2229f3f015
|
N°1395 : New Portuguese BR translations (thanks to Anderson Cardoso!)
SVN:trunk[5896]
|
2018-06-21 08:22:23 +00:00 |
|
Eric Espié
|
2706ebf638
|
Merged from 2.4
N°1488 - restore failed on production-modules [from revision 5827]
SVN:trunk[5828]
|
2018-06-05 14:14:37 +00:00 |
|