vgilc
|
0a1e11b927
|
Merge branch '1072-new-macro-to-get-the-module-id-dev' into 'develop'
Added new macro
See merge request !705
|
2017-08-18 12:37:46 +02:00 |
|
vgilc
|
386e48fe58
|
Merge branch '1155-Fallo-en-conexión-con-LDAP-dev' into 'develop'
Fixed Connection failure in ldap
See merge request !715
|
2017-08-18 12:37:07 +02:00 |
|
vgilc
|
50a7ea3dd9
|
Merge branch '1045-Insert-data-pierde-información-dev' into 'develop'
Fixed agent lost in insert data
See merge request !614
|
2017-08-18 12:36:06 +02:00 |
|
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 |
|
artica
|
3ce15d5814
|
Auto-updated build strings.
|
2017-08-18 00:01:12 +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 |
|
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 |
|
vgilc
|
fd08f1eec0
|
Merge branch '1206-Problemas-Consola-Visual3-dev' into 'develop'
fixed errors in visual console on simple value 2
See merge request !728
|
2017-08-11 11:56:08 +02:00 |
|
Daniel Maya
|
5973ec7545
|
fixed errors in visual console on simple value 2
|
2017-08-11 11:48:25 +02:00 |
|
Ramon Novoa
|
9760a7b7fe
|
Add perl-Test-WWW-Selenium to the testing Docker image.
(cherry picked from commit f6c3922bba23b290b71ff742eb13807563ad3fd6)
|
2017-08-11 11:12:18 +02:00 |
|
vgilc
|
ac2d555df8
|
Merge branch '1206-Problemas_Consola_Visual_rev2' into 'develop'
fixed errors visual console
See merge request !727
|
2017-08-11 09:33:42 +02:00 |
|
daniel
|
33ccab173e
|
fixed errors visual console
|
2017-08-11 09:13:26 +02:00 |
|
artica
|
941341585e
|
Auto-updated build strings.
|
2017-08-11 00:01:13 +02:00 |
|
vgilc
|
d29c24476a
|
Merge branch '1206-Problemas_Consola_Visual_rev' into 'develop'
fixed errors in visual console on simple value
See merge request !726
|
2017-08-10 17:48:36 +02:00 |
|
daniel
|
0915e46e4c
|
fixed errors in visual console on simple value
|
2017-08-10 17:45:00 +02:00 |
|
vgilc
|
3b3e7a9c97
|
Merge branch '1206-Problemas-Consola-Visual-dev' into 'develop'
Fixed issue with simple value
See merge request !725
|
2017-08-10 15:49:36 +02:00 |
|
Daniel Maya
|
e1d4a81034
|
Fixed issue with simple value
|
2017-08-10 15:45:53 +02:00 |
|
artica
|
8309e4fffb
|
Updated version and build strings.
|
2017-08-10 10:37:06 +02:00 |
|
artica
|
bbe63a30ec
|
Auto-updated build strings.
|
2017-08-10 00:01:15 +02:00 |
|
vgilc
|
2f5928754d
|
Merge branch '1200-Time-range-en-gráficas-de-interfaces-SNMP-dev' into 'develop'
Fixed time range with user no admin
See merge request !724
|
2017-08-09 11:39:40 +02:00 |
|
Daniel Maya
|
2bcc01c9ba
|
Fixed time range with user no admin
|
2017-08-09 11:33:12 +02:00 |
|
vgilc
|
431cafc713
|
Merge branch '1199-Problema_commit_japones_al_borrar_modulos_da_fallo_sql' into 'develop'
fixed minor error sql delete module
See merge request !723
|
2017-08-09 10:56:19 +02:00 |
|
daniel
|
be0a91ed2c
|
fixed minor error sql delete module
|
2017-08-09 10:35:57 +02:00 |
|