Luis
84611c7d29
Merge branch 'develop' into 'ent-4669-fallo-escritura-notificacion-serialize-precision'
...
# Conflicts:
# pandora_console/include/class/ConsoleSupervisor.php
2019-09-26 11:44:56 +02:00
alejandro-campos
0fdf3874d4
Add ACL in integria ticket dashboard
2019-09-26 11:05:27 +02:00
alejandro-campos
93b176269c
remove acl check in integria ticket dashboard
2019-09-26 10:38:12 +02:00
alejandro-campos
ca184faaa0
minor visual fix in integria ticket creation
2019-09-26 10:10:55 +02:00
alejandro-campos
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
alejandro-campos
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
artica
0dd0c4c36d
Auto-updated build strings.
2019-09-26 00:01:08 +02:00
Tatiana Llorente
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
marcos.alconada
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
Alejandro Fraguas
970cbbb4be
Merge branch 'ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker' into 'develop'
...
module_interval in broker (linux agents)
See merge request artica/pandorafms!2709
2019-09-25 15:34:48 +02:00
Tatiana Llorente
188fce7174
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:52:58 +02:00
Tatiana Llorente
84ae4a8391
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
Daniel Rodriguez
e03e83d565
Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop'
...
fixed error percentil label
See merge request artica/pandorafms!2734
2019-09-25 10:27:13 +02:00
artica
0a6c5352e6
Auto-updated build strings.
2019-09-25 00:01:10 +02:00
fbsanchez
3be05cf385
added module_interval feature to broker agents
2019-09-24 19:13:55 +02:00
fbsanchez
afe730d4c4
Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker
2019-09-24 19:09:33 +02:00
Alejandro Fraguas
8cca9d5f64
Merge branch 'ent-4616-discovery-en-windows' into 'develop'
...
Windows: Revisión general Pandora - Discovery
See merge request artica/pandorafms!2715
2019-09-24 19:07:55 +02:00
fbsanchez
746f817fe4
Windows: Revisión general Pandora - Discovery
2019-09-24 19:07:55 +02:00
Daniel Barbero Martin
43aa13b4e5
fixed summatory series custom graph
2019-09-24 17:39:11 +02:00
alejandro-campos
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
Kike
4ae14e0888
Fixed issue with instructions in events view
2019-09-24 15:14:17 +02:00
Daniel Rodriguez
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
fbsanchez
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
Daniel Rodriguez
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
Daniel Rodriguez
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
fbsanchez
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
artica
1d58e25a88
Auto-updated build strings.
2019-09-24 00:01:11 +02:00
Alejandro Campos
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
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
Daniel Maya
4e47aede4c
Fixed modules_get_relations
2019-09-23 16:55:43 +02:00
fbsanchez
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
manuel
b7ff7bc121
Fixed bug in report items
2019-09-23 15:27:06 +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
alejandro-campos
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
alejandro-campos
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
Tatiana Llorente
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
Tatiana Llorente
f9a903319c
Adding tabs and new functions - #4644
2019-09-23 13:14:20 +02:00
Alejandro Fraguas
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
alejandro-campos
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
Daniel Rodriguez
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
manuel
5f760b9c83
Added files smallfonts and unicode into ttfonts directory
2019-09-23 09:05:53 +02:00
artica
2543f54413
Auto-updated build strings.
2019-09-23 00:01:17 +02:00
artica
b763650177
Auto-updated build strings.
2019-09-22 00:01:06 +02:00
artica
27d8c5025e
Auto-updated build strings.
2019-09-21 00:01:09 +02:00
Alejandro Fraguas
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
alejandro-campos
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
