Eric Espie
|
f6855b0d2b
|
Display events in the datamodel page
|
2022-06-01 08:44:12 +02:00 |
|
Eric Espie
|
93cc29f4d9
|
refactor
|
2022-05-31 15:42:09 +02:00 |
|
Eric Espie
|
b827c68187
|
Merge branch 'develop' into feature/faf_event_service
|
2022-05-25 10:04:54 +02:00 |
|
Pierre Goiffon
|
3d541b2a2d
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
|
2022-05-24 11:29:12 +02:00 |
|
Molkobain
|
6086131d3c
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-05-20 09:36:03 +02:00 |
|
Molkobain
|
2b0cc4d0e7
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-05-18 20:01:52 +02:00 |
|
Molkobain
|
4eb43cd02d
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-05-18 19:29:57 +02:00 |
|
Molkobain
|
afc8354523
|
Code cleanup
|
2022-05-14 20:42:48 +02:00 |
|
Molkobain
|
23fab1bab0
|
N°4287 - Portal: Factorize TWIG extensions between portal and backoffice
|
2022-05-14 20:42:48 +02:00 |
|
Molkobain
|
1feb5e6ad6
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-04-08 13:32:08 +02:00 |
|
Eric Espie
|
f6d92a189b
|
CRUD reentrance protection
|
2022-04-05 10:28:12 +02:00 |
|
Eric Espie
|
c788c93542
|
Merge branch 'develop' into feature/faf_event_service
|
2022-03-30 08:22:47 +02:00 |
|
Molkobain
|
ad4442ae78
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-03-23 09:49:11 +01:00 |
|
acognet
|
1db4b9a12e
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-03-16 09:44:33 +01:00 |
|
Eric Espie
|
a773f0d8a2
|
EventService: refactoring
|
2022-03-15 17:53:38 +01:00 |
|
Eric Espie
|
29c6b73d93
|
EventService: refactoring
|
2022-03-15 17:50:13 +01:00 |
|
Eric Espie
|
5b52ca4776
|
EventService: phpdoc
|
2022-03-15 15:45:03 +01:00 |
|
Eric Espie
|
8ddaf1b731
|
EventService: call FireEvent with only one parameter (PSR14)
|
2022-03-15 15:41:55 +01:00 |
|
Eric Espie
|
964ce44577
|
EventService: code cleanup
|
2022-03-15 15:11:57 +01:00 |
|
Eric Espie
|
cea6c557ce
|
Merge branch 'develop' into feature/faf_event_service
|
2022-03-15 10:52:45 +01:00 |
|
Molkobain
|
f4ecdf116a
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-03-09 19:55:35 +01:00 |
|
Molkobain
|
5854c199d0
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-03-07 12:54:13 +01:00 |
|
Eric Espie
|
4bdf84bf6c
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-03-03 10:23:38 +01:00 |
|
Pierre Goiffon
|
ee7fb15fc2
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-02-14 08:44:12 +01: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
|
60c372f535
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-02-02 11:20:58 +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
|
ff7d1f2d6a
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-01-17 19:21:52 +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 |
|
Pierre Goiffon
|
5f575d524a
|
N°4621 Fix naming inconsistencies in sources/*
|
2021-12-31 15:44:59 +01:00 |
|