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

16688 Commits

Author SHA1 Message Date
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel 6b80ce6967 Merge remote-tracking branch 'origin/develop' into 1826-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-26 08:36:31 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
daniel 40aa1a1175 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-23 14:31:30 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
daniel f69fb8a5f9 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-21 14:00:14 +01:00
vgilc 09b4d61ed6 Merge branch '1948-Se_queda_en_blanco_la_recon_view' into 'develop' 
fixed minor error recorn view

See merge request artica/pandorafms!1310
 2018-02-21 12:42:18 +01:00
daniel 41e55aa80f fixed minor error recorn view 2018-02-21 12:23:52 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
artica b4416c3c8a Updated version and build strings. 2018-02-20 16:40:43 +01:00
vgilc 3b94629f8f Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-final' into 'develop' 
Change visual console digital clock colors - #1403

See merge request artica/pandorafms!1307
 2018-02-20 09:55:50 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
enriquecd 9a525f3b2e Change visual console digital clock colors - #1403 2018-02-19 19:17:53 +01:00
daniel 25242e19d4 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-19 09:32:42 +01:00
daniel 8be776e3ea fixed errrors graphs 2018-02-19 09:31:45 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel d7a8283994 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-16 13:14:45 +01:00
artica 12ef611493 Auto-updated build strings. 2018-02-16 00:01:13 +01:00
vgilc e47ddb3d47 Merge branch '1924-dbuncompress' into 'develop' 
Fixed dbuncompress short unknown events

See merge request artica/pandorafms!1302
 2018-02-15 11:29:39 +01:00
fbsanchez df0480d12a Fixed dbuncompress short unknown events 2018-02-15 11:19:44 +01:00
vgilc e83201c457 Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop' 
Change cluster view design - #1877

See merge request artica/pandorafms!1301
 2018-02-15 09:42:46 +01:00
artica d90c6ef778 Auto-updated build strings. 2018-02-15 00:01:13 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
vgilc 1ffb335138 Merge branch '1915-LDAP-no-encuentra-el-usuario-o-contraseña-en-la-base-de-datos-dev' into 'develop' 
Added safe_output for password in ldap

See merge request artica/pandorafms!1299
 2018-02-14 11:57:07 +01:00
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
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
daniel 7bc9a6cfb5 graph 2018-02-12 13:29:25 +01:00