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

16852 Commits

Author SHA1 Message Date
danielmaya a0c01ed57d Added safe_output for password in ldap 2018-02-14 10:57:08 +01:00
vgilc ef3ec1238a Merge branch '1867-errores-en-vista-de-eventos-con-usuario-con-tags-tmb' into 'develop' 
Fix avoid unexistent tag in tevent acl check

See merge request artica/pandorafms!1297
 2018-02-14 08:49:14 +01:00
vgilc 3af0e812c2 Merge branch '1913-CDE-Tools' into 'develop' 
Exception control added to safe_input and safe_output

See merge request artica/pandorafms!1293
 2018-02-14 08:48:40 +01:00
artica 4fbf0820a4 Auto-updated build strings. 2018-02-14 00:01:13 +01:00
vgilc 71ac83466f Merge branch '1916-Fallo-SQL-al-buscar-coma-simple' into 'develop' 
Fixed SQL error on unscaped parameter

See merge request artica/pandorafms!1298
 2018-02-13 17:40:31 +01:00
fbsanchez 1a986fccf6 Fixed SQL error on unscaped parameter 2018-02-13 17:34:09 +01:00
fbsanchez 92287916eb Fix avoid unexistent tag in tevent acl check 2018-02-13 16:48:36 +01:00
vgilc 128be1f9d1 Merge branch '1748-Sistema-de-gestion-de-Clusters-fixMR' into 'develop' 
Fix MR - #1748

See merge request artica/pandorafms!1296
 2018-02-13 16:18:43 +01:00
enriquecd a6b28cb40e Fix MR - #1748 2018-02-13 15:59:30 +01:00
enriquecd 7f7916a18d Add new fileds to massive module edition - #1735 2018-02-13 12:29:55 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
vgilc 83820a63af Merge branch '1881-No-aparecen-consolas-visuales-en-el-listado-de-consolas-dev' into 'develop' 
Fixed issue with copy and delete visual console

See merge request artica/pandorafms!1294
 2018-02-13 11:44:59 +01:00
danielmaya a801ba4ac8 Fixed issue with copy and delete visual console 2018-02-13 11:40:43 +01:00
fbsanchez cc27e63773 Exception control added to safe_input and safe_output 2018-02-13 10:59:00 +01:00
vgilc 4eafda8b15 Merge branch '1853-Modulos-DISABLED-en-critical-dev' into 'develop' 
Fixed disabled agent in bulk operations

See merge request artica/pandorafms!1292
 2018-02-13 09:35:39 +01:00
artica ab10cec7ba Auto-updated build strings. 2018-02-13 00:01:13 +01:00
danielmaya 95c92efc6f Fixed disabled agent in bulk operations 2018-02-12 17:14:54 +01:00
vgilc 8e0772fbe5 Merge branch '1907-Error_SQL_vista_de_agente' into 'develop' 
fixed error in acl combined profile

See merge request artica/pandorafms!1291
 2018-02-12 16:30:53 +01:00
daniel b419f71e7c fixed error in acl combined profile 2018-02-12 16:10:29 +01:00
vgilc b43bfa1cf8 Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags_2' into 'develop' 
fixed error acl

See merge request artica/pandorafms!1290
 2018-02-12 12:44:31 +01:00
daniel fabe14b7ea fixed error acl 2018-02-12 12:38:28 +01:00
vgilc bfdcf168bc Merge branch '1749-Sistema_cache_de_acls_de_la_consola_2' into 'develop' 
fixed error acl perm PM in view agent

See merge request artica/pandorafms!1289
 2018-02-12 11:25:37 +01:00
daniel 615c61bfb2 fixed error acl perm PM in view agent 2018-02-12 11:14:04 +01:00
vgilc 5b18f1a9e4 Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf_3' into 'develop' 
add configuration token conf pandora

See merge request artica/pandorafms!1288
 2018-02-12 10:14:57 +01:00
daniel bed124b483 add configuration token conf pandora 2018-02-12 10:08:46 +01:00
vgilc 8c7c3b2c09 Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop' 
fixed error show events

See merge request artica/pandorafms!1287
 2018-02-12 08:52:04 +01:00
artica be4509cbf1 Auto-updated build strings. 2018-02-10 00:01:14 +01:00
daniel 74a8212032 fixed error show events 2018-02-09 14:20:49 +01:00
vgilc cdaa9e54e6 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios--4850-com1' into 'develop' 
Fix system log - #1571

See merge request artica/pandorafms!1286
 2018-02-09 08:31:23 +01:00
artica a6451d01e2 Auto-updated build strings. 2018-02-09 00:01:15 +01:00
enriquecd 75d48ef5fe Fix system log - #1571 2018-02-08 18:22:12 +01:00
vgilc 63b5926e25 Merge branch '1895-Revision_informes_Automatic_Combined_Graph_desde_Metaconsola' into 'develop' 
fixed errors in automatic combined graph meta with TIP

See merge request artica/pandorafms!1285
 2018-02-08 17:14:47 +01:00
daniel 3e0edcfda8 fixed errors in automatic combined graph meta with TIP 2018-02-08 17:07:54 +01:00
vgilc a5a6371270 Merge branch '1782-Esos-mapas-dev' into 'develop' 
Fixed colour bug in interface link

See merge request artica/pandorafms!1283
 2018-02-08 16:27:54 +01:00
danielmaya eb38025b19 Fixed colour bug in interface link 2018-02-08 16:20:29 +01:00
vgilc 219d0a31ee Merge branch '1897-imagenes-wux-historico' into 'develop' 
Fixed image handle in data view

See merge request artica/pandorafms!1282
 2018-02-08 14:23:00 +01:00
fbsanchez 571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +01:00
artica 4aab64be3d Auto-updated build strings. 2018-02-08 00:01:15 +01:00
vgilc 7d27d5f9a7 Merge branch '1403-Añadir-relojes-a-consolas-visuales-com1' into 'develop' 
Add clocks to visual console - #1403

See merge request artica/pandorafms!1145
 2018-02-07 17:14:09 +01:00
vgilc 2ea74b7b63 Merge branch '1837-No-funciona-la-APP-android-móvil-en-la-versión-v718' into 'develop' 
Fix pandroid index page - #1837

See merge request artica/pandorafms!1281
 2018-02-07 17:13:43 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-02-07 17:02:15 +01:00
enriquecd 3b1c9e16a5 Fix pandroid index page - #1837 2018-02-07 16:56:21 +01:00
vgilc 7fd534c68f Merge branch 'MR-Sistema-de-gestión-de-Clusters' into 'develop' 
MR 12 clusters - #1748

See merge request artica/pandorafms!1280
 2018-02-07 15:41:43 +01:00
vgilc 9531984eac Merge branch '1748-Sistema-de-gestión-de-Clusters' into 'develop' 
1748 sistema de gestión de clusters

See merge request artica/pandorafms!1279
 2018-02-07 15:41:29 +01:00
enriquecd c0ee22dbd9 MR 12 clusters - #1748 2018-02-07 15:19:17 +01:00
vgilc f71135a08e Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-tooltip' into 'develop' 
Change data precision visual styles token tooltip - #1634

See merge request artica/pandorafms!1278
 2018-02-07 13:59:57 +01:00
vgilc 4f6ad6be6b Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-4908-media' into 'develop' 
Show correct info in visual console static graphs tooltips - #1634

See merge request artica/pandorafms!1277
 2018-02-07 13:59:44 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd f4b36a941c Change data precision visual styles token tooltip - #1634 2018-02-07 13:32:55 +01:00
enriquecd 6851af5943 Show correct info in visual console static graphs tooltips - #1634 2018-02-07 12:46:29 +01:00