0980c9a74a
Ent 5261 cambio de control de intervalo en alertas
2020-01-16 13:50:39 +01:00
2189709cf6
Merge branch 'ent-5240-9303-bloqueos-discovery' into 'develop'
...
Fixed method calls in Base.pm
See merge request artica/pandorafms!2996
2020-01-16 13:06:28 +01:00
4a1801bc50
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 08:04:18 +01:00
40f03e5682
Auto-updated build strings.
2020-01-16 00:01:08 +01:00
d8a09bf359
Fixed errors VC
2020-01-15 17:37:24 +01:00
9777b687b4
Merge branch 'ent-5262-Mejoras-de-laylout-en-vista-de-alertas' into 'develop'
...
Ent 5262 mejoras de laylout en vista de alertas
See merge request artica/pandorafms!3011
2020-01-15 17:28:23 +01:00
c68f83f013
availability failover
2020-01-15 17:16:46 +01:00
c389769602
Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
d9062def99
Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024
2020-01-15 16:01:11 +01:00
3f26f2ef6f
fix bug when deleting custom units and changed default value for byte multiplier
2020-01-15 16:00:33 +01:00
8b6c1261a9
change order of form port input
2020-01-15 15:37:42 +01:00
6dbe75169f
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +01:00
c3ae3f08a7
Fixed errors VC
2020-01-15 14:28:43 +01:00
c1a124c970
Merge branch 'ent-5099-Dobles-interfaces-en-mapas-de-red-no-se-visualizan' into 'develop'
...
Ent 5099 dobles interfaces en mapas de red no se visualizan
See merge request artica/pandorafms!3004
2020-01-15 14:11:36 +01:00
28b585196b
Ent 5099 dobles interfaces en mapas de red no se visualizan
2020-01-15 14:11:36 +01:00
1b5dcd781f
Merge branch 'support-mysql8.0' into 'develop'
...
support for MySQL 8.0
See merge request artica/pandorafms!2984
2020-01-15 13:53:49 +01:00
4cc0fb0090
Merge branch 'ent-5219-fallo-cambiar-grupo-mapa-red' into 'develop'
...
Fixed group change on networkmap.ACL and source group working separated
See merge request artica/pandorafms!3010
2020-01-15 12:14:37 +01:00
2926ead13b
Fixed group change on networkmap.ACL and source group working separated
2020-01-15 12:14:37 +01:00
121ac2e80e
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-15 07:57:22 +01:00
6bf5d07a2c
Auto-updated build strings.
2020-01-15 00:01:09 +01:00
89b43f1aee
loading on resize and update elements VC
2020-01-14 15:52:47 +01:00
5eb2953810
Added port option on server configuration to be used when connecting to execution server
2020-01-14 15:43:17 +01:00
e723c98275
Fix clocks
2020-01-14 15:02:38 +01:00
95600412e1
Minor visual changes in alert list
2020-01-14 13:14:09 +01:00
dcd2aae3c5
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
ed53399c3c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-14 09:34:31 +01:00
b725315ed0
Merge branch 'ent-4795-Check-Seleccionar-todos-queda-marcado' into 'develop'
...
Ent 4795 check seleccionar todos queda marcado
See merge request artica/pandorafms!2821
2020-01-14 08:37:04 +01:00
7c928b8100
Ent 4795 check seleccionar todos queda marcado
2020-01-14 08:37:04 +01:00
587e53dbd0
Merge branch 'ent-5259-Cambiar-estado-In-process-de-evento-no-añade-comentario' into 'develop'
...
Ent 5259 cambiar estado in process de evento no añade comentario
See merge request artica/pandorafms!3009
2020-01-14 08:36:43 +01:00
8038e16c25
Auto-updated build strings.
2020-01-14 00:01:11 +01:00
5a6efdd141
Merge branch 'ent-4832-revision-de-exportacion-de-informes-a-csv' into 'develop'
...
Fixed bug in CSV export
See merge request artica/pandorafms!2835
2020-01-13 18:28:09 +01:00
8d651ff139
Merge branch 'ent-4862-Mas-opciones-en-los-filtros-de-severidad' into 'develop'
...
Ent 4862 mas opciones en los filtros de severidad
See merge request artica/pandorafms!2985
2020-01-13 18:24:29 +01:00
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
df721fc550
Merge branch 'ent-4602-Descuadre-Visual-console-Chrome-y-Chromium' into 'develop'
...
Fixed public_console height
See merge request artica/pandorafms!2950
2020-01-13 18:24:01 +01:00
9cf16d91f8
Merge branch 'ent-5225-Bug-visual-en-demo-visual-console-2-meta' into 'develop'
...
Ent 5225 bug visual en demo visual console 2 meta
See merge request artica/pandorafms!3002
2020-01-13 18:22:45 +01:00
b19881d84b
Merge branch 'ent-5191-fuentes-informes-custom-report-front' into 'develop'
...
report font not depending of custom report front enabled
See merge request artica/pandorafms!2980
2020-01-13 18:21:48 +01:00
db49db3711
report font not depending of custom report front enabled
2020-01-13 18:21:48 +01:00
33aaca3c4e
Merge branch 'ent-5165-error-pdf-report-names-generated-by-template' into 'develop'
...
Fixed meta regex agent matching ids
See merge request artica/pandorafms!2976
2020-01-13 18:21:17 +01:00
b1b6306c30
Merge branch 'ent-4975-Añadir-todas-las-horas-al-formulario-del-cron-from-y-cron-to' into 'develop'
...
fixed module cron minute selectors
See merge request artica/pandorafms!2892
2020-01-13 18:20:57 +01:00
914f232e69
Merge branch 'ent-3136-No-se-ven-los-eventos-en-el-mapa-de-servicios-cuando-haces-click-en-los-elementos-de-un-servicio-creado-en-la-meta' into 'develop'
...
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta
See merge request artica/pandorafms!2939
2020-01-13 18:19:50 +01:00
1747806256
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta
2020-01-13 18:19:50 +01:00
602ce39907
Fixed clock item VC
2020-01-13 17:13:52 +01:00
ffce6399b0
Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
...
Secured get_file script for unauthorized file download
See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
f32d3ecc0b
Merge branch 'ent-5237-Vulnerabilidad-en-una-funcion-de-gestión-de-ficheros-externos' into 'develop'
...
fixed file vulnerability
See merge request artica/pandorafms!2994
2020-01-13 15:07:16 +01:00
e54740ec19
fixed parent input
2020-01-13 14:19:56 +01:00
60bd600392
module graph convert to image base 64
2020-01-13 13:31:23 +01:00
40a86384c2
Add comment in events when status is changed
2020-01-13 13:00:43 +01:00
72fb69a299
Merge branch 'ent-5233-xss-vulnerability-in-agent-description-edition' into 'develop'
...
Fixed XSS vulnerability
See merge request artica/pandorafms!2995
2020-01-13 11:29:18 +01:00
49e03f5e44
Fixed XSS vulnerability
2020-01-13 11:29:18 +01:00
4f6ed7c39f
Fix tinyMCE background grey
2020-01-13 10:14:51 +01:00
Tatiana Llorente
Alejandro Fraguas
Daniel Barbero Martin
artica
Daniel Rodriguez
Daniel Maya
Alejandro Campos
vgilc
Luis