Commit Graph

18889 Commits

Author SHA1 Message Date
fbsanchez 9211396134 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-10 15:40:16 +01:00
fbsanchez 843f4f3f50 Wux style review 2020-03-10 15:39:44 +01:00
Daniel Rodriguez 97f3902cf4 Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop'
fix bad parameter in function call

See merge request artica/pandorafms!3068
2020-03-10 12:11:29 +01:00
Daniel Rodriguez 326e784e4d Merge branch 'ent-5404-Boton-de-creacion-desplazado-en-consolas-visuales' into 'develop'
Ent 5404 boton de creacion desplazado en consolas visuales

See merge request artica/pandorafms!3086
2020-03-10 10:17:59 +01:00
artica 8b3dafc48f Auto-updated build strings. 2020-03-10 01:00:15 +01:00
fbsanchez d0f1239d9d Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-09 18:50:23 +01:00
artica b7408b5e99 Auto-updated build strings. 2020-03-09 01:00:14 +01:00
artica 1ff7219e06 Auto-updated build strings. 2020-03-08 01:00:13 +01:00
artica d995210494 Auto-updated build strings. 2020-03-07 01:00:14 +01:00
artica bdd6cde6c2 Auto-updated build strings. 2020-03-06 01:00:16 +01:00
artica 4a5af5da40 Auto-updated build strings. 2020-03-05 01:00:08 +01:00
fbsanchez fd23ed30c5 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-04 11:37:35 +01:00
artica 9d3db50cf4 Auto-updated build strings. 2020-03-04 01:00:07 +01:00
Daniel Barbero 19b571fc78 update version 2020-03-03 10:17:18 +01:00
artica 3e6cc7b2e7 Auto-updated build strings. 2020-03-03 01:00:09 +01:00
Tatiana Llorente c8e492b194 Moved creation button to right side in visual maps - #5404 2020-03-02 11:41:54 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
Alejandro Fraguas 3c542b4d06 Merge branch 'ent-5371-tags-perfil-usuario-monitor-view' into 'develop'
Fixed monitor view groups without tags

See merge request artica/pandorafms!3083
2020-03-02 10:24:07 +01:00
artica 97037d1266 Auto-updated build strings. 2020-03-02 01:00:08 +01:00
artica 501d76b975 Auto-updated build strings. 2020-03-01 01:00:08 +01:00
artica b106981613 Auto-updated build strings. 2020-02-29 01:00:10 +01:00
Tatiana Llorente c820a32b53 Ent 4492 consola visual por paises 2020-02-28 14:37:44 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00
Kike 4cdabc1c91 Added new mibs 2020-02-28 11:32:33 +01:00
Daniel Maya 30e1021877 Fixed conflict in tpolicies 2020-02-28 08:51:00 +01:00
artica 6e594f5503 Auto-updated build strings. 2020-02-28 01:00:10 +01:00
fbsanchez b125f7618e browser option in wux modules 2020-02-27 18:41:28 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Alejandro Fraguas 8c77637d19 Merge branch 'ent-5273-9370-5708-failed-to-read-configuration-file' into 'develop'
Ent 5273 9370 5708 failed to read configuration file

See merge request artica/pandorafms!3047
2020-02-27 14:04:02 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
daniel ac6ca52c45 Fixed resulution charts 2020-02-27 10:52:01 +01:00
artica a9590892bf Auto-updated build strings. 2020-02-27 01:00:09 +01:00
marcos e28415250c remove entities from reports 2020-02-26 15:18:42 +01:00
vgilc a0ea52983b Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"
This reverts merge request !2519
2020-02-26 14:27:19 +01:00
artica 3b9e100f9f Auto-updated build strings. 2020-02-26 01:00:08 +01:00
marcos 0cdd33f69a deleted alert correlations fms 2020-02-25 11:19:45 +01:00
artica 400809ce61 Auto-updated build strings. 2020-02-25 01:00:10 +01:00
Daniel Rodriguez a519330b42 Merge branch 'ent-5201-correlacion-de-alertas-fase-2' into 'develop'
alert correlation update

See merge request artica/pandorafms!3063
2020-02-24 18:11:09 +01:00
Daniel Rodriguez 43ca1bdc5d Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop'
Fixed when you select 'show all modules' and the module is not from the interface

See merge request artica/pandorafms!3056
2020-02-24 14:30:49 +01:00
Alejandro Fraguas 568b869681 Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'
Removed entitites

See merge request artica/pandorafms!2519
2020-02-24 14:15:14 +01:00
alejandro-campos 4bdea42c63 fix bad parameter in function call 2020-02-24 13:16:22 +01:00
Daniel Maya 9f01356b6f conflict resolved 2020-02-24 09:49:25 +01:00
artica 03b97f4fdb Auto-updated build strings. 2020-02-24 01:00:07 +01:00
artica bfab0285e5 Auto-updated build strings. 2020-02-23 01:00:11 +01:00
artica 1667ed4f1c Auto-updated build strings. 2020-02-22 01:00:10 +01:00
marcos dcce09befd fixed error 2020-02-21 14:53:48 +01:00
Daniel Rodriguez b0f0ef3f98 Merge branch 'policies-rework' into 'develop'
Replaced old policies with reworked ones

See merge request artica/pandorafms!3060
2020-02-21 13:51:17 +01:00
Daniel Rodriguez 4e403bca72 Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters

See merge request artica/pandorafms!3064
2020-02-21 13:27:34 +01:00
alejandro-campos 0a1dd6fe24 fix save of filters 2020-02-21 13:01:47 +01:00
marcos f25aacf108 fixed erro2 2020-02-21 10:58:04 +01:00