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

7552 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04:58 +01:00
Alejandro Gallardo Escobar c687e6a97b [Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function 2017-10-27 13:25:27 +02:00
vgilc 1dd8f630f8 Merge branch '1066-Traducción-erronea-al-actualizar-configuración-en-setup-setup-General-setup' into 'develop' 
Fix translation - #1066

See merge request artica/pandorafms!955
 2017-10-24 08:48:47 +02:00
artica 326b1a0828 Auto-updated build strings. 2017-10-24 00:01:10 +02:00
enriquecd 5ef2b24a56 Fix translation - #1066 2017-10-23 19:11:58 +02:00
artica 906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
Daniel Maya 5eacf15d65 Fixed issue in filter visual console 2017-10-23 15:37:07 +02:00
vgilc 9de7f7591d Merge branch '1478-Problemas_varios_en_consolas_visuales' into 'develop' 
1478 problemas varios en consolas visuales

See merge request artica/pandorafms!944
 2017-10-23 11:06:51 +02:00
daniel 12f51156f8 fixed error background image metaconsole 2017-10-23 10:35:57 +02:00
vgilc 3fcf01f886 Merge branch '1478-Filtro-para-consolas-visuales--Carrefour]-dev' into 'develop' 
added filter in VISUAL CONSOLE

See merge request artica/pandorafms!942
 2017-10-23 09:12:32 +02:00
artica f59c4f591c Auto-updated build strings. 2017-10-23 00:01:07 +02:00
artica 50c0447d85 Auto-updated build strings. 2017-10-22 00:01:08 +02:00
artica 83b0e393e1 Auto-updated build strings. 2017-10-21 00:01:07 +02:00
vgilc 6944705855 Merge branch '1466-problems-with-linked-visualmap-status-dev' into 'develop' 
Added change about linked visualmaps

See merge request artica/pandorafms!938
 2017-10-20 11:57:28 +02:00
Daniel Maya c1bd70a0f0 added filter in VISUAL CONSOLE 2017-10-20 11:44:58 +02:00
daniel fc5fce8f5e fixed multiple error static_graph meta 2017-10-20 11:08:45 +02:00
artica 30f4162d91 Auto-updated build strings. 2017-10-20 00:01:08 +02:00
daniel 5ad47dba9b fixed minor error in img size in visual console 2017-10-19 16:03:04 +02:00
artica 038fce3346 Auto-updated build strings. 2017-10-19 00:01:08 +02:00
Arturo Gonzalez 0f2d6d17be Added change about linked visualmaps 2017-10-18 15:13:26 +02:00
artica 157670c21c Auto-updated build strings. 2017-10-18 00:01:15 +02:00
vgilc a6ba78ca20 Merge branch '1427-Fixed-minor-error-in-networkmaps-dev' into 'develop' 
Added minor fix

See merge request !930
 2017-10-17 15:36:47 +02:00
Arturo Gonzalez 504201b822 Added minor fix 2017-10-17 13:44:36 +02:00
vgilc 56cd90d43a Merge branch '1241-change-text-in-advanced-permissions-ldap-dev' into 'develop' 
Text changed

See merge request !926
 2017-10-17 09:50:56 +02:00
artica fc762719c9 Auto-updated build strings. 2017-10-17 00:01:21 +02:00
vgilc 4c3e200946 Merge branch '145-plain-text-mail-cannot-be-send-by-email_problems_mr' into 'develop' 
fixed error in function check mr

See merge request !921
 2017-10-16 10:26:31 +02:00
Arturo Gonzalez 8f7cb910ac Text changed 2017-10-16 08:34:39 +02:00
artica 6c11b68d3d Auto-updated build strings. 2017-10-16 00:01:18 +02:00
artica 606697a405 Auto-updated build strings. 2017-10-15 00:01:19 +02:00
artica 6bfc11be4a Auto-updated build strings. 2017-10-14 00:01:20 +02:00
fermin831 befb859e23 Fixed auto SLA item on visual console when no module is selected 2017-10-13 14:16:37 +02:00
daniel 48e68b1264 fixed error in function check mr 2017-10-13 14:08:50 +02:00
artica 3fb49f294d Auto-updated build strings. 2017-10-13 00:02:12 +02:00
daniel e912e151a9 fixed errors in setup tip AND prediction modules 2017-10-11 13:17:29 +02:00
artica 6bc0949942 Auto-updated build strings. 2017-10-11 00:01:25 +02:00
artica ec95400043 Auto-updated build strings. 2017-10-10 00:01:23 +02:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
artica 2553494696 Auto-updated build strings. 2017-10-09 00:01:22 +02:00
artica 406ceaf8d3 Auto-updated build strings. 2017-10-08 00:01:32 +02:00
daniel 45743e2dc5 Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto 2017-10-06 08:37:56 +02:00
artica c1ff200f3c Auto-updated build strings. 2017-10-06 00:01:24 +02:00
Daniel Maya edeeb19bed fixed csv import 2017-10-05 15:22:55 +02:00
vgilc 79f6c7fb49 Merge branch '1250-Salida-de-comandos-como-capturas' into 'develop' 
Fix data 64 images in dialog for command_snapshot config token - #1250

See merge request !844
 2017-10-05 12:27:32 +02:00
artica 9e475f5710 Auto-updated build strings. 2017-10-05 00:01:23 +02:00
vgilc e34480c278 Merge branch 'ent-1346-graficas-con-distinto-tamano-en-pdf' into 'develop' 
Added two significant digits to labels on pChart

See merge request !880
 2017-10-04 17:47:53 +02:00
vgilc e1cefdb84f Merge branch '1324-Nombre-del-agente-erróneo-en-los-eventos-generados-por-cambio-de-inventario-dev' into 'develop' 
group by id_agent in group events

See merge request !866
 2017-10-04 17:43:39 +02:00
vgilc d181edc471 Merge branch '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' into 'develop' 
New feature. Dynamic units

See merge request !818
 2017-10-04 17:41:37 +02:00
fermin831 40dcdad0de Added two significant digits to labels on pChart 2017-10-04 16:52:49 +02:00
vgilc bd184f9e7a Merge branch '1358-Configuracion-de-email-en-la-consola-de-Pandora-dev' into 'develop' 
Added encryption select in enterprise setup

See merge request !869
 2017-10-04 16:05:51 +02:00
vgilc 13f12baa33 Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop' 
Use alias as name with option default tconfig - #1255

See merge request !803
 2017-10-04 15:52:17 +02:00