Commit Graph

18 Commits

Author SHA1 Message Date
alejandro.campos@artica.es e8b62561b7 fixed entities 2021-06-15 14:53:00 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
alejandro-campos 6aa0824390 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 16:59:55 +02:00
alejandro-campos b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
Tatiana Llorente 3bfa7fb596 Added ACL in integria tabs 2019-09-23 16:56:29 +02:00
alejandro-campos 8d2820df37 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 15:17:22 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 59eed5f1af Minor fixes - #4644 2019-09-23 15:09:52 +02:00
Tatiana Llorente f9a903319c Adding tabs and new functions - #4644 2019-09-23 13:14:20 +02:00