Commit Graph

17243 Commits

Author SHA1 Message Date
vgilc c489ae1b4c Merge branch '2267-Pete-Tree-VIew-dev' into 'develop'
fixed conditional in ajax.php

See merge request artica/pandorafms!1497
2018-05-24 16:41:59 +02:00
danielmaya 8a6755d224 fixed conditional in ajax.php 2018-05-24 16:28:51 +02:00
vgilc ad3a7071b3 Merge branch '2297-Visor-de-logs-pone-un-ancho-enorme-y-se-mete-en-scroll-horizontal' into 'develop'
Fixed white-space / pre-wrap

See merge request artica/pandorafms!1494
2018-05-24 12:07:09 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
manuel.montes b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +02:00
vgilc dcf6e46f61 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop'
Más corrección de errores

See merge request artica/pandorafms!1492
2018-05-23 08:46:52 +02:00
vgilc 6727941bac Merge branch 'ent-2268-fallo-en-la-vista-de-RSS-de-eventos' into 'develop'
Fixed rss events due to secondary groups

See merge request artica/pandorafms!1481
2018-05-23 08:45:45 +02:00
vgilc 076724ba35 Merge branch '1141-Ajustar-grafica-a-los-valores-mostrados' into 'develop'
add zoom graphs xy

See merge request artica/pandorafms!1491
2018-05-23 08:45:17 +02:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Alejandro Gallardo Escobar 37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel 3accc31372 add zoom graphs xy 2018-05-22 15:57:36 +02:00
vgilc 58370449dd Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop'
Removed unreachable host from events responses

See merge request artica/pandorafms!1450
2018-05-22 10:00:37 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
vgilc f9a5df12db Merge branch 'ent-2266-mobile-sql-injection-vulnerability' into 'develop'
Vulnerabilidad: Inyección SQL en la consola móvil

See merge request artica/pandorafms!1486
2018-05-21 17:55:47 +02:00
vgilc a075d5ff8f Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop'
Corrección de errores

See merge request artica/pandorafms!1488
2018-05-21 17:53:07 +02:00
Alejandro Gallardo Escobar f0f331be4e Moved a button 2018-05-21 16:22:38 +02:00
Alejandro Gallardo Escobar 447958144e Error fix 2018-05-21 16:00:54 +02:00
Alejandro Gallardo Escobar 2e96c2bbd1 Fixed a SQL injection vulnerability 2018-05-21 15:19:25 +02:00
vgilc 1f3e09ae14 Merge branch '2162-filtrado-de-interfaces-en-dynamic-snmp' into 'develop'
Added dynamic_snmp to std Pandora versioning

See merge request artica/pandorafms!1422
2018-05-21 11:45:52 +02:00
fbsanchez 6821ae9178 Merge remote-tracking branch 'origin/develop' into 2162-filtrado-de-interfaces-en-dynamic-snmp 2018-05-21 10:57:01 +02:00
vgilc b283cb2469 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop'
Improvements and fixes into the internal audit view

See merge request artica/pandorafms!1468
2018-05-21 08:50:11 +02:00
vgilc 2cc7fe00e9 Merge branch 'ent-2284-fix-xss-vulnerability' into 'develop'
Fixed XSS vulnerability

See merge request artica/pandorafms!1483
2018-05-21 08:39:43 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
Alejandro Gallardo Escobar cada865042 Fixed XSS vulnerability 2018-05-18 11:00:41 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
vgilc 89ebab9378 Merge branch '2279-ráficas-en-blanco-en-vista-móvil-dev' into 'develop'
Fixed mobile graph

See merge request artica/pandorafms!1482
2018-05-17 17:32:29 +02:00
danielmaya 7783f81f59 Fixed mobile graph 2018-05-17 16:43:31 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
fermin831 fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
vgilc 334d359076 Merge branch 'ent-2244-5710-No-funciona-el-Command-Line-Screenshot-en-v722' into 'develop'
Fixed snapshots view in string data

See merge request artica/pandorafms!1471
2018-05-14 11:46:07 +02:00
vgilc f920a407fb Merge branch '2231-Vistas-realtime-en-modulos-de-red-2' into 'develop'
Fixed repeated real time item on agents view

See merge request artica/pandorafms!1479
2018-05-14 08:47:32 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
Fermin 6479e3ac64 Fixed repeated real time item on agents view 2018-05-11 13:14:08 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
vgilc cacdce9de8 Merge branch 'ent-1892-EXT-5237-el-percentil-no-se-muestra-en-las-graficas-personalizadas-del-un-contenedor-grafico-2' into 'develop'
Do not show always the percentil in custom graphs

See merge request artica/pandorafms!1478
2018-05-10 17:40:15 +02:00
fermin831 fcebfceffb Do not show always the percentil in custom graphs 2018-05-10 17:29:50 +02:00
vgilc f341844368 Merge branch 'ent-2215-cut-node-names-networkmap' into 'develop'
The node names of the networkmap are reduced if they are too long

See merge request artica/pandorafms!1477
2018-05-10 13:22:25 +02:00
Alejandro Gallardo Escobar 7d6e50814f Merge branch 'develop' into ent-2215-cut-node-names-networkmap 2018-05-10 12:41:28 +02:00
Alejandro Gallardo Escobar 9af7b75e3e The node names of the networkmap are reduced if they are too long 2018-05-10 11:46:49 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
vgilc e8f7adc1de Merge branch '2246-ajustes-jmx-weblogic' into 'develop'
Added pandora_plugin_jmx to update version procedure

See merge request artica/pandorafms!1475
2018-05-09 18:03:20 +02:00
fbsanchez 10685e6aa2 Added pandora_plugin_jmx to update version procedure 2018-05-09 12:00:38 +02:00
vgilc 902186633c Merge branch '2249-Vulnerabilidad-grave---Ejecución-remota-de-código-dev' into 'develop'
Fixed check login in ajax.php

See merge request artica/pandorafms!1474
2018-05-09 11:44:20 +02:00
danielmaya 3c7fe95a33 Added check login and check acl in update_manager.ajax 2018-05-09 11:37:53 +02:00