746f817fe4
Windows: Revisión general Pandora - Discovery
2019-09-24 19:07:55 +02:00
43aa13b4e5
fixed summatory series custom graph
2019-09-24 17:39:11 +02:00
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
4ae14e0888
Fixed issue with instructions in events view
2019-09-24 15:14:17 +02:00
8e728eed6b
Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop'
...
changed style on tables pdf report
See merge request artica/pandorafms!2718
2019-09-24 12:33:46 +02:00
ce19ac529f
Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker
2019-09-24 12:27:38 +02:00
2798512208
Merge branch 'ent-4680-fallos-en-los-reports-de-eventos' into 'develop'
...
Fixed bug in report items
See merge request artica/pandorafms!2750
2019-09-24 12:06:14 +02:00
8327cbc794
Merge branch 'ent-4615-implementar-cifrado-en-los-contenedores-de-credenciales-usando-el-sistema-de-cifrado-interno-de-pandora' into 'develop'
...
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
See merge request artica/pandorafms!2744
2019-09-24 11:25:53 +02:00
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
1d58e25a88
Auto-updated build strings.
2019-09-24 00:01:11 +02:00
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
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
b8e1caba9d
minor fixes
2019-09-23 16:59:16 +02:00
3bfa7fb596
Added ACL in integria tabs
2019-09-23 16:56:29 +02:00
f122cf0997
Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker
2019-09-23 16:30:57 +02:00
b7ff7bc121
Fixed bug in report items
2019-09-23 15:27:06 +02:00
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
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
59eed5f1af
Minor fixes - #4644
2019-09-23 15:09:52 +02:00
637700422e
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-23 14:47:23 +02:00
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
51a1d7c0b7
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-23 13:18:08 +02:00
f9a903319c
Adding tabs and new functions - #4644
2019-09-23 13:14:20 +02:00
bf15240d7c
Merge branch 'ent-2391-instalador-agente-tarball-integrar-con-systemd' into 'develop'
...
Added pandora_agente_daemon service to systemd
See merge request artica/pandorafms!2702
2019-09-23 13:13:22 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
596bd6a566
Merge branch 'ent-4667-aadcm-peta-la-ejecucion-de-tareas-programadas' into 'develop'
...
web2image control phantomjs flow
See merge request artica/pandorafms!2739
2019-09-23 11:40:08 +02:00
2543f54413
Auto-updated build strings.
2019-09-23 00:01:17 +02:00
b763650177
Auto-updated build strings.
2019-09-22 00:01:06 +02:00
27d8c5025e
Auto-updated build strings.
2019-09-21 00:01:09 +02:00
0418c86867
Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop'
...
pandora HA review
See merge request artica/pandorafms!2654
2019-09-20 13:57:03 +02:00
be3de8dcfb
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-20 12:45:22 +02:00
0df2447770
added comment management and fixed some errors in incident edition
2019-09-20 12:37:47 +02:00
375bfca6ff
New view - Dashboard details of Integria IMS tickets - #4644
2019-09-20 12:27:36 +02:00
409ac061e0
Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
...
Ent 4047 simplificacion de la configuracion del sistema de email
See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
0bdf967259
Temporarily disable cert verification for STARTTLS too.
2019-09-20 10:36:56 +02:00
d8ab1defcb
Auto-updated build strings.
2019-09-20 00:01:09 +02:00
28559f4fcb
Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop'
...
Add new visual console Host Alive Keep Alive
See merge request artica/pandorafms!2701
2019-09-19 16:10:33 +02:00
274b6b9327
Disable certificate verification until it can be turned on/off from the console.
2019-09-19 15:27:46 +02:00
0e281c7a0a
Send sendmail errors to pandora_server.error.
2019-09-19 12:43:31 +02:00
6107d141c0
Update pandoradb_data.sql
2019-09-19 12:40:53 +02:00
91117e3d60
Merge branch 'ent-3878-report-sumation-no-funciona-bien' into 'develop'
...
Fixed bug
See merge request artica/pandorafms!2741
2019-09-19 12:17:35 +02:00
37fd876a22
Fixed bug
2019-09-19 10:31:54 +02:00
e09db0b9a9
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-19 10:24:58 +02:00
1177cce25f
added attached files section to incident edition
2019-09-19 10:24:43 +02:00
6def88472a
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
14f73f147f
Auto-updated build strings.
2019-09-19 00:01:10 +02:00
8acdde9f3a
Added date filter - #4642
2019-09-18 18:19:29 +02:00
d939bf9e93
Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop'
...
Ent 3878 report type summation not working properly migratesql
See merge request artica/pandorafms!2738
2019-09-18 17:54:17 +02:00
42c0fa9a5a
web2image control phantomjs flow
2019-09-18 16:58:02 +02:00
4adf584827
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
...
Changed caption Expires
See merge request artica/pandorafms!2736
2019-09-18 16:49:55 +02:00
fbsanchez
Daniel Barbero Martin
alejandro-campos
Kike
Daniel Rodriguez
artica
Tatiana Llorente
manuel
Alejandro Fraguas
Ramon Novoa
Marcos Alconada
Luis Calvo