Eric Espie
|
e91e53c0ec
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# composer.lock
# datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
|
2022-07-11 17:24:06 +02:00 |
|
Molkobain
|
4eb43cd02d
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-05-18 19:29:57 +02:00 |
|
Pierre Goiffon
|
d437e2d662
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# application/displayblock.class.inc.php
# core/config.class.inc.php
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-faq-light/module.itop-faq-light.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-structure/module.itop-structure.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
|
2022-02-08 15:43:20 +01:00 |
|
Molkobain
|
ff7d1f2d6a
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-01-17 19:21:52 +01:00 |
|
Pierre Goiffon
|
5f575d524a
|
N°4621 Fix naming inconsistencies in sources/*
|
2021-12-31 15:44:59 +01:00 |
|