Commit Graph

15304 Commits

Author SHA1 Message Date
vgilc 6920831d60 Merge branch '1185-Bug_Update_Manager_Online_Pandora_7_Open' into 'develop'
fixed errors in update manager open

See merge request !714
2017-08-18 12:35:32 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop'
Fixed issue with cascade_protection_module

See merge request !720
2017-08-18 12:34:31 +02:00
daniel f0efe69ad4 fixed error in wux 2017-08-18 12:02:47 +02:00
artica 3ce15d5814 Auto-updated build strings. 2017-08-18 00:01:12 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya 498272d75d Update setup log collector 2017-08-17 11:07:22 +02:00
artica f7ecefcc60 Auto-updated build strings. 2017-08-17 00:01:13 +02:00
vgilc 0cc45be6e5 Merge branch '1109-Bug-en-migrate-a-Pandora-FMS-7.0-dev' into 'develop'
Fixed delimiter

See merge request !735
2017-08-16 17:24:34 +02:00
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