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

15504 Commits

Author SHA1 Message Date
Ramon Novoa 702bed8c13 Retry queries when a deadlock is found. 
Ref pandora_enterprise#1126.
 2017-10-18 10:45:55 +02:00
vgilc cd0a15906f Merge branch 'ent-1455-auto-sla-no-funciona-cuando-esta-asignada-a-un-agente' into 'develop' 
Fixed auto SLA item on visual console when no module is selected

See merge request !922
 2017-10-13 14:54:23 +02:00
vgilc b22fe4bd36 Merge branch '1449-No_mostrar_check_para_graficas_TIP_en_modulos_de_tipo_prediction_rev' into 'develop' 
fixed minor errors

See merge request !923
 2017-10-13 14:53:44 +02:00
daniel 8fbe360333 fixed minor errors 2017-10-13 14:44:12 +02:00
fermin831 befb859e23 Fixed auto SLA item on visual console when no module is selected 2017-10-13 14:16:37 +02:00
vgilc 4d5a129ec4 Merge branch 'configuracion-remota-en-32-bits' into 'develop' 
Replace a 32 bit shift with two 16 bit shifts.

See merge request !875
 2017-10-13 12:02:59 +02:00
artica 3fb49f294d Auto-updated build strings. 2017-10-13 00:02:12 +02:00
vgilc c1fe2a3447 Merge branch '1425-new-improvements-in-route-analyzer-feature-dev' into 'develop' 
1425 new improvements in route analyzer feature dev

See merge request !919
 2017-10-11 17:40:55 +02:00
vgilc 9b4288501a Merge branch '1449-No_mostrar_check_para_graficas_TIP_en_modulos_de_tipo_prediction' into 'develop' 
fixed errors in setup tip AND prediction modules

See merge request !918
 2017-10-11 16:14:42 +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
vgilc 9181d1ca16 Merge branch '1389-Filtro-de-Tags-dev' into 'develop' 
Fixed search by tags

See merge request !912
 2017-10-10 13:46:29 +02:00
Daniel Maya fc9a5c4662 Fixed search by tags 2017-10-10 13:39:44 +02:00
vgilc f72e6887d4 Merge branch '1266-Checkbox-All-modules-en-operaciones-masivas-4472-onenet-2b' into 'develop' 
Only unselect any option in module bulks operation multiselect when select any and others at the same time - #1266

See merge request !911
 2017-10-10 12:59:35 +02:00
vgilc bd29622bb7 Merge branch '1442-fix-purgado-de-datos-string' into 'develop' 
Fix pandora_db string data purge

See merge request !909
 2017-10-10 12:58:32 +02:00
enriquecd 8525426763 Only unselect any option in mulselect when select any and others at the same time - #1266 2017-10-10 12:36:47 +02:00
Arturo Gonzalez 1e6f3a9d9b Borja fix this error 2017-10-10 11:44:15 +02:00
fbsanchez 4fc33ec58b Fix pandora_db string data purge 2017-10-10 11:26:04 +02:00
artica ec95400043 Auto-updated build strings. 2017-10-10 00:01:23 +02:00
Arturo Gonzalez 391655f6fe Added images and Borsha fix 2017-10-09 17:11:08 +02:00
vgilc cf075dadb9 Merge branch '1350-Eliminacion-y-mejora-de-las-secciones-de-diagnostico-de-pandora-3' into 'develop' 
Delete system info section file - #1350

See merge request !906
 2017-10-09 16:11:13 +02:00
enriquecd 5812b56e0b Delete system info section file - #1350 2017-10-09 15:50:51 +02:00
vgilc a3b0f5c86c Merge branch '1350-Eliminacion-y-mejora-de-las-secciones-de-diagnostico-de-pandora-2b' into 'develop' 
Fix pandora diag texts and delete old sections files - #1350

See merge request !905
 2017-10-09 15:42:28 +02:00
enriquecd c86bd5cc3c Fix pandora diag texts and delete old secitons files - #1350 2017-10-09 15:36:28 +02:00
vgilc b8809b2c36 Merge branch '1424-Usuarios-estándar-no-pueden-cambiar-el-rango-de-tiempo-en-Gráficas-de-Agentes-dev' into 'develop' 
Changed period in functions_html

See merge request !901
 2017-10-09 13:16:58 +02:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
vgilc f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop' 
add send mail plain/text

See merge request !862
 2017-10-09 10:11:27 +02:00
vgilc 80495ddaf7 Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop' 
create mr8 for send mail plain/text

See merge request !863
 2017-10-09 10:11:07 +02:00
vgilc 35f2b4fa6e Merge branch '177-WUX-console-no-se-ve-por-una-errata-dev' into 'develop' 
fixed wux_console_view

See merge request !883
 2017-10-09 10:09:33 +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
vgilc 1008912e94 Merge branch '1260-Mensajes_DB_status' into 'develop' 
fixed minor error in db status

See merge request !891
 2017-10-06 09:46:37 +02:00
daniel b431be44cd fixed minor error in db status 2017-10-06 09:40:48 +02:00
vgilc 539053d61d Merge branch '1335-Configurar_graficas_full_scale_por_defecto' into 'develop' 
add new select to setup for TIP

See merge request !856
 2017-10-06 09:19:34 +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
vgilc eac3462f60 Merge branch '1321-falta-de-datos-al-exportar-CSV-desde-graficas-dev' into 'develop' 
fixed csv import

See merge request !890
 2017-10-05 17:01:09 +02:00
Daniel Maya edeeb19bed fixed csv import 2017-10-05 15:22:55 +02:00
vgilc 9b59702edd Merge branch '1255-Opción-para-tener-Alias-as-name-por-defecto-4463-reopen' into 'develop' 
Change token text in general setup - #1255

See merge request !889
 2017-10-05 13:48:28 +02:00
enriquecd ca24fbc270 Change token text in general setup - #1255 2017-10-05 12:58:40 +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
vgilc 368431300d Merge branch '1273-Remote-snmp-OpenSource-dev' into 'develop' 
Fixed snmp version in plugin snmp_remote

See merge request !888
 2017-10-05 12:24:55 +02:00
Daniel Maya b5fcf50257 Fixed snmp version in plugin snmp_remote 2017-10-05 12:12:59 +02:00
vgilc 79d4d864e3 Merge branch '1428-La-extension-UX-solo-debe-mostrarse-si-hay-datos-de-tipo-UX-dev' into 'develop' 
Fixed menu ux_console_tab

See merge request !887
 2017-10-05 11:48:26 +02:00
Daniel Maya bc38ff630a Fixed menu ux_console_tab 2017-10-05 10:52:10 +02:00
vgilc 53bb048673 Merge branch '1350-Eliminación-y-mejora-de-las-secciones-de-diagnóstico-de-pandora' into 'develop' 
Db maintenance section is now called Admin tools with only admin access permissi…

See merge request !885
 2017-10-05 09:57:18 +02:00
vgilc f063190294 Merge branch '1389-Filtro-de-Tags-en-Eventos-dev' into 'develop' 
Fixed search by tags in event list

See merge request !881
 2017-10-05 09:54:11 +02:00
artica 9e475f5710 Auto-updated build strings. 2017-10-05 00:01:23 +02:00
enriquecd 570a209861 Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350 2017-10-04 19:02:45 +02:00
Daniel Maya ed87dbd7a3 fixed wux_console_view 2017-10-04 17:54:35 +02:00