Commit Graph

15801 Commits

Author SHA1 Message Date
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
vgilc 555dc3744d Revert "Merge branch…"
This reverts merge request !1045
2017-11-10 12:24:01 +01:00
vgilc 29971f4d38 Merge branch '1512-ldap-atributo-de-login-dev' into 'develop'
Added changes to fix ldap login

See merge request artica/pandorafms!1047
2017-11-10 10:13:31 +01:00
vgilc a38f47b4a9 Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714_2' into 'develop'
fixed errors in TIP

See merge request artica/pandorafms!1045
2017-11-10 10:12:51 +01:00
Arturo Gonzalez fe4a93f646 Added changes to fix ldap login 2017-11-10 09:33:12 +01:00
artica 680d23038e Auto-updated build strings. 2017-11-10 00:01:09 +01:00
artica f512bea610 Auto-updated build strings. 2017-11-09 00:01:13 +01:00
daniel e6e925cbf6 fixed errors in TIP 2017-11-08 18:57:37 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
vgilc bb05772d60 Merge branch 'comportamiento-de-icmp_checks-por-defecto' into 'develop'
Change the default number of ICMP packets and retries for ping modules.

See merge request artica/pandorafms!1041
2017-11-08 12:21:52 +01:00
vgilc 2afa91461a Merge branch '1534-No-se-inicializan-módulos-SNMPv3-dev' into 'develop'
Fixed entities in networkserver.pm

See merge request artica/pandorafms!1042
2017-11-08 12:09:58 +01:00
danielmaya 1d7df38b61 Fixed entities in networkserver.pm 2017-11-08 11:55:23 +01:00
vgilc 0344b7d5d8 Merge branch '1378-donut-graph-element-in-visual-console-dev' into 'develop'
Added color to resume data

See merge request artica/pandorafms!1039
2017-11-08 10:47:49 +01:00
Ramon Novoa ab03a6b71c Change the default number of ICMP packets and retries for ping modules.
Ref pandora_enterprise#1562.
2017-11-08 10:37:15 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
vgilc ebc209e7eb Merge branch '1416-bars-graph-element-in-visual-console-dev' into 'develop'
Added grid color to bars graph in visual console

See merge request artica/pandorafms!1038
2017-11-08 10:06:24 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
artica b461121361 Auto-updated build strings. 2017-11-08 00:01:10 +01:00
vgilc 3c920e9d10 Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix-2' into 'develop'
Fix pdf graph labels 2 - #417

See merge request artica/pandorafms!1032
2017-11-07 12:04:57 +01:00
vgilc 68a6770a45 Merge branch '145-plain-text-mail-cannot-be-send-by-email_2' into 'develop'
Resolve "plain text mail cannot be send by 'eMail'."

See merge request artica/pandorafms!1033
2017-11-07 11:56:41 +01:00
vgilc 601d67fc7e Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714' into 'develop'
fixed errors in fullscale graph and normal graph

See merge request artica/pandorafms!1025
2017-11-07 11:50:23 +01:00
daniel baab22bb28 add queries mr8 and migrate 2017-11-07 11:44:09 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
enriquecd 2eec3dc766 Fix pdf graph labels 2 - #417 2017-11-07 11:43:42 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop'
Fixed problems with unit

See merge request artica/pandorafms!1027
2017-11-07 11:23:02 +01:00
vgilc 47171418cd Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop'
Modified simple value

See merge request artica/pandorafms!1026
2017-11-07 11:22:28 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
vgilc 1510bbf118 Merge branch '132-cambiar-configuracion-en-app-event-viewer-int-3824' into 'develop'
Resolve "Cambiar configuracion en app Event viewer [Int. 3824]"

See merge request artica/pandorafms!1012
2017-11-07 10:53:21 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
artica 3763a1a93c Auto-updated build strings. 2017-11-07 00:01:10 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
vgilc 3c9410678b Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-en-su-contraseña-dev' into 'develop'
Fixed call snmp in server

See merge request artica/pandorafms!1021
2017-11-06 17:40:02 +01:00
vgilc 1001b78ec2 Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix' into 'develop'
Fix PDF reports labels - #417

See merge request artica/pandorafms!1023
2017-11-06 17:29:44 +01:00
enriquecd b6d3444212 Fix PDF reports labels - #417 2017-11-06 17:02:54 +01:00
vgilc b0638cf996 Merge branch '654-Cambios-en-informes-de-maximo,-minimo-y-media-int-4480-fix-2' into 'develop'
Fix maximum data column - #654

See merge request artica/pandorafms!1022
2017-11-06 16:49:46 +01:00
enriquecd 74fbd11628 Fix maximum data column - #654 2017-11-06 16:15:06 +01:00
danielmaya 6cd13dbc6d Fixed call snmp in server 2017-11-06 15:53:33 +01:00
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +01:00
Alejandro Gallardo Escobar 83becb3e80 [Console] Fixed an error into the 'ui_print_truncate_text' function 2017-11-06 15:18:55 +01:00
vgilc 9b163ce3e0 Merge branch '1367-radial-dinamic-rotate-texts-around-center-dev' into 'develop'
Added some modifications to sunburst d3 function

See merge request artica/pandorafms!1018
2017-11-06 12:15:30 +01:00
Arturo Gonzalez b01d0e78af Added some modifications to sunburst d3 function 2017-11-06 10:52:27 +01:00
vgilc c76ac64476 Merge branch '1396-visual-console-percentile-elements-problems-with-color-and-encoding-dev' into 'develop'
Fixed encoding problems and default label color

See merge request artica/pandorafms!1017
2017-11-06 09:29:16 +01:00
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
vgilc c45154e9d7 Merge branch '179-Se-han-dejado-una-traza-en-la-vista-de-agente-dev' into 'develop'
Fixed traces

See merge request artica/pandorafms!1015
2017-11-03 14:48:47 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop'
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
2017-11-03 13:49:40 +01:00