tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,042 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

15042 Commits

Author SHA1 Message Date
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 f6c3922bba)
 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
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
vgilc 728d471d6d Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop' 
Disabled select for not admins

See merge request !722
 2017-08-08 15:26:17 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
vgilc dcfd4a7939 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_rev2' into 'develop' 
fixed error in graph container

See merge request !721
 2017-08-08 12:26:07 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
vgilc af81f139e0 Merge branch '1024-Agrupar_graficas_rev' into 'develop' 
fixed minor error

See merge request !719
 2017-08-07 17:08:21 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
vgilc 8d2b2da941 Merge branch '1192-mr_5_changes_mysql' into 'develop' 
mr-5 add queries

See merge request !718
 2017-08-07 14:02:30 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
vgilc 120fbad29d Merge branch '1127-Elementos-desplazados-en-mapas-GIS-dev' into 'develop' 
Fixed issue in public console

See merge request !716
 2017-08-07 11:44:51 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
Daniel Maya 160ad7e866 Fixed Connection failure in ldap 2017-08-07 09:21:26 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
daniel e875ce9b4e fixed errors in update manager open 2017-08-04 14:07:27 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
vgilc 6e25fc6ba9 Merge branch '1082-change-pass-db-register-dev' into 'develop' 
Added registration method to reset pass

See merge request !707
 2017-08-03 17:05:24 +02:00
daniel 88411aedf5 fixed minor error 2017-08-03 15:07:49 +02:00