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

16268 Commits

Author SHA1 Message Date
vgilc 5e11907963 Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-return-dev' into 'develop' 
Fixed get oid

See merge request artica/pandorafms!1163
 2017-12-05 13:11:17 +01:00
vgilc 4b416e3af2 Merge branch '1329-Visualizar-auditoria-de-cambios-de-contraseña-Ext-4225-2' into 'develop' 
Insert password changes by recover mail in system audit log - #1329

See merge request artica/pandorafms!1164
 2017-12-05 13:10:08 +01:00
enriquecd abce89355d Insert password changes by recover mail in system audit log - #1329 2017-12-05 12:56:50 +01:00
danielmaya 6d4f460ef8 Fixed get oid 2017-12-05 12:13:38 +01:00
vgilc 20720c9f0b Merge branch 'grep_syslog_module' into 'develop' 
Add an icon and constants for the new Syslog server.

See merge request artica/pandorafms!1160
 2017-12-05 11:39:44 +01:00
vgilc b1090f2c03 Merge branch 'thread_log' into 'develop' 
Add support for thread status logging.

See merge request artica/pandorafms!1161
 2017-12-05 11:38:17 +01:00
Ramon Novoa e495afe5ed Add support for thread status logging. 
Ref pandora_enterprise#1551.
 2017-12-05 11:28:29 +01:00
Ramon Novoa dca173c8b8 Add an icon and constants for the new Syslog server. 2017-12-05 11:15:23 +01:00
vgilc 18fa3d29a9 Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop' 
Mostrar los descendientes de los grupos filtrados en el tree view

See merge request artica/pandorafms!1159
 2017-12-05 09:55:06 +01:00
Alejandro Gallardo Escobar 33ab429182 [Console] Now the group filter extract the searched groups and show their descendants 2017-12-05 09:43:37 +01:00
artica 9d9233c99f Auto-updated build strings. 2017-12-05 00:01:16 +01:00
vgilc f572603882 Merge branch '1278-extension-vmware-ext-4456-y-4479' into 'develop' 
1278 extension vmware ext 4456 y 4479

See merge request artica/pandorafms!1158
 2017-12-04 16:21:15 +01:00
fbsanchez acfccd37ae Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 2017-12-04 16:12:43 +01:00
vgilc 27c8a05a33 Merge branch '1552-vmware-plugin-no-esta-actualizado-en-las-isos' into 'develop' 
Added target lib and plugins to pandora_update_version

See merge request artica/pandorafms!1157
 2017-12-04 16:02:12 +01:00
fbsanchez 151ca3379a Minor typo in pandora_update_version 2017-12-04 15:52:05 +01:00
fbsanchez 177571ad9e Added target lib and plugins to pandora_update_version 2017-12-04 15:50:29 +01:00
vgilc 8c187ad4be Merge branch '1669-Sincronizacion-de-agentes-deshabilitados-de-la-metaconsola-Carrefour' into 'develop' 
Fix agent sinchronization from node to metaconsole when enable/disable and have…

See merge request artica/pandorafms!1156
 2017-12-04 15:29:05 +01:00
vgilc 928fdc84ed Merge branch '1552-vmware-plugin-no-esta-actualizado-en-las-isos' into 'develop' 
1552 vmware plugin no esta actualizado en las isos

See merge request artica/pandorafms!1131
 2017-12-04 15:23:55 +01:00
enriquecd a97c8dde6d Fix agent sinchronization from node to metaconsole when enable/disable and have same id_agent in their nodes - #1669 2017-12-04 13:50:13 +01:00
vgilc 9869433f6b Merge branch 'LDAP-change-email-by-mail-dev' into 'develop' 
Changed email by mail in mysql

See merge request artica/pandorafms!1155
 2017-12-04 12:24:25 +01:00
danielmaya a024d66fd7 Changed email by mail in mysql 2017-12-04 12:20:13 +01:00
danielmaya 87e2f4f3f9 Fixed filter in gis maps 2017-12-04 11:41:52 +01:00
artica 4d4cee2251 Auto-updated build strings. 2017-12-04 00:01:08 +01:00
artica 3d5e8760cd Auto-updated build strings. 2017-12-03 00:01:09 +01:00
artica dc8c5c54e6 Auto-updated build strings. 2017-12-02 00:01:38 +01:00
vgilc e7fd532aa3 Merge branch '1351-mala-ruta-en-icono-de-borrado-en-filtros-snmp-dev' into 'develop' 
Added good relative path

See merge request artica/pandorafms!1149
 2017-12-01 13:21:29 +01:00
Arturo Gonzalez f96e8277a0 Added good relative path 2017-12-01 12:53:16 +01:00
danielmaya 8b9c59a3b0 Fixed Unkwon Icon in GIS 2017-12-01 12:44:07 +01:00
vgilc 1949ee653b Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop' 
1540 ayuda general en mapas de red dev

See merge request artica/pandorafms!1144
 2017-12-01 11:21:37 +01:00
Arturo Gonzalez d1f198b80b Added new networkmaps help section 2017-12-01 11:16:09 +01:00
vgilc f84cfa2a86 Merge branch '1538-estilo-deshabilitado-en-nuevos-campos-de-graphviz-dev' into 'develop' 
Added disabled style

See merge request artica/pandorafms!1143
 2017-12-01 10:58:21 +01:00
vgilc 46737798ba Merge branch '1351-filtros-snmp-fallo-en-texto-dev' into 'develop' 
Changed text

See merge request artica/pandorafms!1142
 2017-12-01 10:57:09 +01:00
Arturo Gonzalez cd7b5b68b6 Added disabled style 2017-12-01 10:14:08 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop' 
Added fix to reset map function

See merge request artica/pandorafms!1140
 2017-12-01 09:31:21 +01:00
Arturo Gonzalez edd648de29 Changed text 2017-12-01 09:10:20 +01:00
vgilc 35ba173b88 Merge branch '1664-al-editar-un-radial-dinamic-pierde-el-tipo-dev' into 'develop' 
Fixed update map

See merge request artica/pandorafms!1141
 2017-12-01 09:04:30 +01:00
vgilc 54f0f9130b Merge branch '1622-mapas-dinamicos-radiales-errores-varios-dev' into 'develop' 
Added more changes to improve radial dynamic maps

See merge request artica/pandorafms!1136
 2017-12-01 09:00:27 +01:00
artica 4652980457 Auto-updated build strings. 2017-12-01 00:01:11 +01:00
fbsanchez c4f9723d0d PluginTools: New methods 
- Added extract_key_map
- Added read_configuration
 2017-11-30 17:00:28 +01:00
Arturo Gonzalez 031196782b Fixed update map 2017-11-30 16:50:10 +01:00
slerena 7ac6aefc2d Merge branch '1483-Cuadro_de_umbrales' into 'develop' 
fixed error d3 in firefox

See merge request artica/pandorafms!946
 2017-11-30 16:40:58 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales 
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
 2017-11-30 16:29:00 +01:00
nramon 9809efd6f3 Merge branch '1630-Lentitud_en_vista_de_eventos_con_muchos_grupos' into 'develop' 
optimization view events

See merge request artica/pandorafms!1139
 2017-11-30 16:12:14 +01:00
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
nramon ac06725d99 Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop' 
Apply db changes to hide no data field event template reports - #1326

See merge request artica/pandorafms!941
 2017-11-30 13:31:48 +01:00
nramon 34be6f88cd Merge branch '1526-grep_syslog_module' into 'develop' 
1526 grep syslog module

See merge request artica/pandorafms!1138
 2017-11-30 13:24:36 +01:00
Ramon Novoa c72f583f0a Merge remote-tracking branch 'origin/develop' into 1526-grep_syslog_module 2017-11-30 13:20:51 +01:00
nramon cf32b4163c Merge branch '1326/1382-MR-db-changes' into 'develop' 
1326 / 1382 - Mr 10 changes

See merge request artica/pandorafms!1137
 2017-11-30 13:12:41 +01:00
nramon 3390dc7c24 Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop' 
Db changes for tgraph_source field order - #1382

See merge request artica/pandorafms!965
 2017-11-30 13:12:31 +01:00