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

15491 Commits

Author SHA1 Message Date
enriquecd 806b282e8f Fix resize sla graphs in visual console - #1334 2017-10-10 18:48:58 +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
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
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
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 563b903012 Merge branch '1373-agent-name-en-lugar-de-alias-en-módulos-sintéticos-dev' into 'develop' 
changed agent name by alias in module_manager_editor_prediction.php

See merge request !861
 2017-10-04 17:44:29 +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
Daniel Maya b0b51c649b Fixed search by tags in event list 2017-10-04 17:43:12 +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 285e63d2a7 Merge branch 'update-mr-token-dev' into 'develop' 
Changed mr token

See merge request !879
 2017-10-04 16:24:54 +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
Arturo Gonzalez 08ff3798c5 Changed mr token 2017-10-04 15:59:56 +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
vgilc aaa21d2bd8 Merge branch '1241-adv-config-in-ldap-auth-dev' into 'develop' 
1241 adv config in ldap auth dev

See merge request !853
 2017-10-04 15:49:39 +02:00
vgilc 45c35a1a0f Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop' 
Fixed error in js library and added good export to graph container graphs

See merge request !828
 2017-10-04 14:28:38 +02:00