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

15555 Commits

Author SHA1 Message Date
fermin831 7379243946 Fixed lower than 1 values on gauges 2017-10-25 18:40:58 +02:00
vgilc 8fa33a2401 Merge branch '1487-Problemas_varios_en_consolas_visuales_4' into 'develop' 
fixed error in visual console link

See merge request artica/pandorafms!966
 2017-10-25 11:12:44 +02:00
daniel cb0bc1bd33 fixed error in visual console link 2017-10-25 11:01:12 +02:00
vgilc 144bf0ef13 Merge branch 'cherry-pick-a235abb9' into 'develop' 
Removed unwanted trace (pandora_module_service.cc)

See merge request artica/pandorafms!948
 2017-10-25 09:43:40 +02:00
artica fc81469b7c Auto-updated build strings. 2017-10-25 00:01:09 +02:00
vgilc 934ed84fd5 Merge branch '1487-Problemas_varios_en_consolas_visuales_3' into 'develop' 
fixed errors visual console

See merge request artica/pandorafms!963
 2017-10-24 18:22:50 +02:00
daniel 4ef0c6cd5f fixed errors visual console 2017-10-24 18:14:57 +02:00
vgilc e49f921ee8 Merge branch '1487-Problemas_varios_en_consolas_visuales_2' into 'develop' 
fixed errors in visual console

See merge request artica/pandorafms!960
 2017-10-24 17:19:21 +02:00
daniel 92d2179469 updated version 2017-10-24 17:11:56 +02:00
daniel b23b9448b6 fixed errors in visual console 2017-10-24 17:03:35 +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
vgilc 7e88dd720e Merge branch 'fix-snmp-alerts-double-encode' into 'develop' 
eventos-de-alertas-snmp-tienen-codificacion-html-en-la-aplicacion-de-android-ext-4282

See merge request artica/pandorafms!950
 2017-10-23 17:24:36 +02:00
Alejandro Gallardo Escobar edcff5e1f1 [Pandora Server] Added a decode to the alert description before the event creation, to avoid a double encode with HTML entities 2017-10-23 16:23:30 +02:00
fermin831 423e6f29e1 Removed unwanted trace (pandora_module_service.cc) 
(cherry picked from commit a235abb903)
 2017-10-23 15:53:07 +02:00
vgilc d443bc03ab Merge branch '1478-Filtro-para-consolas-visuales-dev' into 'develop' 
Fixed issue in filter visual console

See merge request artica/pandorafms!947
 2017-10-23 15:44:08 +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
vgilc 7121d4a343 Merge branch 'deadlocks-base-de-datos-en-cluster-de-percona-4137' into 'develop' 
Retry queries when a deadlock is found.

See merge request !936
 2017-10-18 11:15:54 +02:00
Ramon Novoa 702bed8c13 Retry queries when a deadlock is found. 
Ref pandora_enterprise#1126.
 2017-10-18 10:45:55 +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 4bd7c7fb1f Merge branch 'reinicio-automatico-de-recon-ext-4100' into 'develop' 
Do not automatically restart manual recon tasks.

See merge request !928
 2017-10-16 17:21:23 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" 
This reverts merge request !862
 2017-10-16 16:44:44 +02:00
vgilc 1838a6b30a Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'" 
This reverts merge request !863
 2017-10-16 16:44:16 +02:00
Ramon Novoa e649815624 Do not automatically restart manual recon tasks. 
Ref pandora_enterprise#1274.
 2017-10-16 15:52:00 +02:00
vgilc db11068838 Merge branch '1350-Eliminación-y-mejora-de-las-secciones-de-diagnóstico-de-pandora-3b' into 'develop' 
Change db maintenance sections buttons location - #1350

See merge request !927
 2017-10-16 13:35:01 +02:00
enriquecd da4a277625 Change db maintenance sections buttons location - #1350 2017-10-16 13:26:30 +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