Commit Graph

15190 Commits

Author SHA1 Message Date
Daniel Maya 059dec7cc9 Fixed delimiter 2017-08-16 17:04:21 +02:00
vgilc 0488324a9e Merge branch '1167-Fallo_en_exportacion_a_CSV_de_Custom_Graphs_rev_2' into 'develop'
fixed minor error

See merge request !734
2017-08-16 16:36:45 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
vgilc 75dcbc5431 Merge branch '1173-Campo-label-no-funciona-en-templates-dev' into 'develop'
Added text line in label help

See merge request !733
2017-08-16 12:11:11 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
artica 8958dd0900 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica c08e17084f Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya e99ef7d0f1 Fixed 2017-08-16 10:38:02 +02:00
Daniel Maya 80faddcbb8 Xaxisname deleted from xaxes 2017-08-16 10:38:02 +02:00
artica 9ddf454e09 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica b973e12a51 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica 5542bd8947 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya 3c18f706fa fixed errors in visual console on simple value 2 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
artica 31d5699a2b Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 61ffae2ae1 fixed errors in visual console on simple value 2017-08-16 10:38:02 +02:00
Daniel Maya 07c115eb4e Fixed issue with simple value 2017-08-16 10:38:02 +02:00
artica ed5c0c71b2 Updated version and build strings. 2017-08-16 10:38:02 +02:00
artica 70988d8c8c Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya fba5a38482 Fixed time range with user no admin 2017-08-16 10:38:02 +02:00
daniel 2d3d9e782f fixed errors metaconsole reports serialize data 2017-08-16 10:38:02 +02:00
daniel 6d2466cba2 fixed minor error 2017-08-16 10:38:02 +02:00
daniel 55ed4ec840 fixed error cli version snmp 2017-08-16 10:38:01 +02:00
Daniel Maya 7d578093d9 Fixed label in automatic graph in node 2017-08-16 10:38:01 +02:00
daniel afc481098d fixed error exportation csv in custom graphs 2017-08-16 10:36:30 +02:00
Daniel Maya 43285a9192 Added label in automatic graph 2017-08-16 10:36:30 +02:00
Daniel Maya 860a81aee8 Fixed urlencode in event popup 2017-08-16 10:36:30 +02:00
Arturo Gonzalez bf77ea14d1 Added recover delimiter 2017-08-16 10:36:30 +02:00
Arturo Gonzalez 09bb7d8cd8 Changed field in sql request 2017-08-16 10:36:30 +02:00
vgilc 139332108d Merge branch '1167-Fallo_en_exportacion_a_CSV_de_Custom_Graphs_rev' into 'develop'
fixed error export csv custom graph

See merge request !732
2017-08-16 10:31:07 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc bf61f8324f Merge branch '1077-sql-error-in-log4x-data-module-dialog-dev' into 'develop'
Changed field in sql request

See merge request !654
2017-08-14 15:30:55 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev'
# Conflicts:
#   pandora_console/include/functions_modules.php
2017-08-14 15:26:54 +02:00
vgilc 395c68450c Merge branch '1206-Problemas-Consola-Visual-4--el-regreso-dev' into 'develop'
Fixed

See merge request !731
2017-08-14 14:58:53 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
vgilc 4813921288 Merge branch '1212-Visualizacion-de-gráficas-con-una-leyenda-que-no-deberia-estar-ahi-dev' into 'develop'
Xaxisname deleted from xaxes

See merge request !730
2017-08-14 14:38:32 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc 47c851be95 Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop'
Added recover delimiter

See merge request !666
2017-08-14 12:25:35 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop'
fixed errors metaconsole reports serialize data

See merge request !712
2017-08-14 12:24:43 +02:00
vgilc 90644f1805 Merge branch '1166-Error_al_crear_modulos_snmp_v2c_a_traves_del_CLI' into 'develop'
fixed error cli version snmp

See merge request !709
2017-08-14 12:23:52 +02:00
vgilc 10182b6aa1 Merge branch '1174-Modificar_ayuda_pandora_manage_create_snmp_module' into 'develop'
fixed minor error

See merge request !711
2017-08-14 12:21:34 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop'
Fixed urlencode in event popup

See merge request !676
2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop'
fixed error exportation csv in custom graphs

See merge request !708
2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop'
Added label in automatic graph

See merge request !706
2017-08-14 12:13:58 +02:00
artica 8462e9d3d5 Auto-updated build strings. 2017-08-14 00:01:13 +02:00
artica cc7b00bb39 Auto-updated build strings. 2017-08-13 00:01:12 +02:00
artica bc022aba2b Auto-updated build strings. 2017-08-12 00:01:13 +02:00