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

16840 Commits

Author SHA1 Message Date
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
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
vgilc 23be1a9921 Merge branch '1882-Reinicio-de-las-sesiones-de-Pandora-a-través-de-un-F5-AON' into 'develop' 
Filter config_prepare_session when use F5 balancer - #1882

See merge request artica/pandorafms!1276
 2018-02-06 17:16:15 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
vgilc dc44db428f Merge branch '1862-Instrucciones-de-módulo-no-aparecen-en-evento-CEPSA' into 'develop' 
Add module critical instructions when create an event - #1862

See merge request artica/pandorafms!1275
 2018-02-06 16:35:41 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 26de4f6517 Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop' 
Fixed module definition help and add autodisable mode to bulk operations

See merge request artica/pandorafms!1129
 2018-02-06 12:17:14 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
vgilc ae9db8bfd8 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop' 
Change system audit log extended info to table format with change info - #1571

See merge request artica/pandorafms!1115
 2018-02-06 11:56:48 +01:00
vgilc b6d145992c Merge branch '1699-Ordenar-alfabéticamente-los-grupos-de-agentes' into 'develop' 
Alphabetic order in group selects - #1699

See merge request artica/pandorafms!1197
 2018-02-06 11:56:17 +01:00
vgilc 6194f84f13 Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop' 
MR 12 changes for animation clock ticket - #1403

See merge request artica/pandorafms!1274
 2018-02-06 11:02:05 +01:00