vgilc
|
5b506764fd
|
Merge branch '1467-Error-en-API-al-deshabilitar-alertas-dev' into 'develop'
Fixed function api_set_disable_alert
See merge request artica/pandorafms!989
|
2017-11-29 16:54:00 +01:00 |
|
vgilc
|
ef86663813
|
Merge branch 'no-cargan-los-modulos-en-cualquier-arbol-que-no-sea-el-de-grupos' into 'develop'
Resolve: No cargan los modulos en cualquier arbol que no sea el de grupos
See merge request artica/pandorafms!977
|
2017-11-29 16:48:38 +01:00 |
|
vgilc
|
9c32657220
|
Merge branch 'ent-1514-buscador-monitor-detail' into 'develop'
Added wux modules to monitor view
See merge request artica/pandorafms!1024
|
2017-11-29 16:48:11 +01:00 |
|
vgilc
|
53ac2d94bf
|
Merge branch '1527-Auto-refresco-no-permite-crear-nuevos-dashboards' into 'develop'
Disable autorefresh on new dashboard view - #1527
See merge request artica/pandorafms!1029
|
2017-11-29 16:47:45 +01:00 |
|
vgilc
|
f8695a2781
|
Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop'
Added _event_cfX_ to macros help
See merge request artica/pandorafms!920
|
2017-11-29 16:47:09 +01:00 |
|
vgilc
|
2705737058
|
Merge branch '1652-se-eliminan-las-lineas-de-las-consolas-en-la-vista-a-pantalla-completa-dev' into 'develop'
Fixed error generated in issue pandora_enterprise#110
See merge request artica/pandorafms!1124
|
2017-11-29 16:42:48 +01:00 |
|
vgilc
|
57dbb0599d
|
Merge branch '1654-No-sale-el-nombre-del-mapa-en-pandora-open-dev' into 'develop'
Added lost map info
See merge request artica/pandorafms!1126
|
2017-11-29 16:20:34 +01:00 |
|
vgilc
|
7ce6535170
|
Merge branch '1658-permisos-para-manipular-archivos-en-colecciones-dev' into 'develop'
Added qw perms
See merge request artica/pandorafms!1127
|
2017-11-29 16:20:08 +01:00 |
|
vgilc
|
019829685c
|
Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop'
Fixed creating network components by snmpwalk
See merge request artica/pandorafms!1065
|
2017-11-29 16:15:21 +01:00 |
|
vgilc
|
3a5b8928ac
|
Merge branch 'ent-1035-busqueda-libre-en-visor-de-datos' into 'develop'
Added free search values to data table
See merge request artica/pandorafms!992
|
2017-11-29 16:10:46 +01:00 |
|
vgilc
|
17f38dfa2f
|
Merge branch '1489-4737-agente-windows-difiere-en-instalacion-normal-y-silenciosa' into 'develop'
Modified windows configuration file to fit with nsis
See merge request artica/pandorafms!986
|
2017-11-29 16:07:22 +01:00 |
|
vgilc
|
659d16d372
|
Merge branch '1329-Visualizar-auditoria-de-cambios-de-contraseña-4225' into 'develop'
Audit password changes in system audit log - #1329
See merge request artica/pandorafms!932
|
2017-11-29 16:03:20 +01:00 |
fermin831
|
11fb91b5c0
|
Merge branch 'develop' into 1489-4737-agente-windows-difiere-en-instalacion-normal-y-silenciosa
Conflicts:
pandora_agents/win32/bin/pandora_agent.conf
|
2017-11-29 15:49:56 +01:00 |
|
vgilc
|
1895bf3fe9
|
Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop'
added unit in custom graphs
See merge request artica/pandorafms!979
|
2017-11-29 15:42:40 +01:00 |
|
vgilc
|
86051a861f
|
Merge branch '1458-Error-al-actualizar-custom-fields' into 'develop'
Not show error when only update custom fields in agents - #1458
See merge request artica/pandorafms!929
|
2017-11-29 15:42:03 +01:00 |
|
vgilc
|
55dd05c406
|
Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop'
Resolve: Buscar un grupo en el tree view carrefour
See merge request artica/pandorafms!1003
|
2017-11-29 15:41:31 +01:00 |
|
vgilc
|
976fd7d315
|
Merge branch '1492-ACL-no-permiten-buscar-en-Monitor-View-dev' into 'develop'
Fixed search in status monitor with ACL enterprise
See merge request artica/pandorafms!949
|
2017-11-29 15:39:37 +01:00 |
|
vgilc
|
1856c5ff5a
|
Merge branch '1530-Mejorar-mensajes-de-DB-Schema-Check--4810-eContinuity' into 'develop'
Put togehter error and info messages in db_status extension - #1530
See merge request artica/pandorafms!1036
|
2017-11-29 15:39:04 +01:00 |
|
vgilc
|
b98ac19f91
|
Merge branch '1570-Error-en-paginación-de-eventos-con-texto-libre-dev' into 'develop'
Fixed pagination errors with free search
See merge request artica/pandorafms!1054
|
2017-11-29 15:38:19 +01:00 |
|
vgilc
|
46e7d29f5a
|
Merge branch '1201-Error_al_iniciar_el_agente_de_Pandora' into 'develop'
fixed error in pandora_agent collections
See merge request artica/pandorafms!934
|
2017-11-29 15:36:58 +01:00 |
|
vgilc
|
8e5215d3fa
|
Merge branch 'ent-1541-contador-de-alertas-disparadas-no-se-actualiza-al-borrar-una-alerta' into 'develop'
Update fired alert when delete it
See merge request artica/pandorafms!1034
|
2017-11-29 14:33:10 +01:00 |
|
vgilc
|
e2680696ee
|
Merge branch 'visual-console-agent-link-bug' into 'develop'
Bug en enlace de agente en Consolas visuales
See merge request artica/pandorafms!952
|
2017-11-29 14:10:51 +01:00 |
|
vgilc
|
89c08ede12
|
Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev
See merge request artica/pandorafms!978
|
2017-11-29 14:07:58 +01:00 |
|
vgilc
|
21e6b784f7
|
Merge branch 'crear-mr-para-el-paquete-717-dev' into 'develop'
Added mr file
See merge request artica/pandorafms!1132
|
2017-11-29 14:07:27 +01:00 |
Alejandro Gallardo Escobar
|
f49cef9ca4
|
Merge branch 'develop' into visual-console-agent-link-bug
Conflicts:
pandora_console/include/ajax/visual_console_builder.ajax.php
|
2017-11-29 14:00:44 +01:00 |
Arturo Gonzalez
|
828d19a47a
|
Added mr file
|
2017-11-29 14:00:27 +01:00 |
|
vgilc
|
684658d81f
|
Merge branch '1409-Imágenes-en-consolas-visuales---enlace-publico-dev' into 'develop'
Changed convert_urls in tinymce
See merge request artica/pandorafms!931
|
2017-11-29 13:47:50 +01:00 |
fbsanchez
|
0edf8cd046
|
PluginTools Fix in __system {solaris}
|
2017-11-29 13:31:27 +01:00 |
|
vgilc
|
6ff9eb054c
|
Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop'
Added link color
See merge request artica/pandorafms!1049
|
2017-11-29 13:28:17 +01:00 |
|
vgilc
|
7beb05f8db
|
Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop'
Fixed filter to show interface graph or not
See merge request artica/pandorafms!957
|
2017-11-29 13:27:39 +01:00 |
|
vgilc
|
8e71f632e8
|
Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop'
Added new option to networkmap, reset
See merge request artica/pandorafms!1035
|
2017-11-29 13:27:00 +01:00 |
|
vgilc
|
c8d5abb0d5
|
Merge branch '1538-valores-editables-de-graphviz-al-crear-mapas-de-red-dev' into 'develop'
Added custom graphviz fields to map creation
See merge request artica/pandorafms!1122
|
2017-11-29 13:26:11 +01:00 |
|
vgilc
|
cf3c9c6ed7
|
Merge branch '1622-filtro-por-grupo-en-mapa-radial-dinamico-dev' into 'develop'
1622 filtro por grupo en mapa radial dinamico dev
See merge request artica/pandorafms!1117
|
2017-11-29 13:24:33 +01:00 |
|
vgilc
|
6ecc9f524c
|
Merge branch '1643-login-con-administrador-en-ldap-para-realizar-acciones-dev' into 'develop'
Added code to login with admin ldap user
See merge request artica/pandorafms!1119
|
2017-11-29 13:24:01 +01:00 |
|
fbsanchez
|
3f82db6c6c
|
Merge branch 'develop' into 1552-vmware-plugin-no-esta-actualizado-en-las-isos
|
2017-11-29 12:08:59 +01:00 |
artica
|
0df9ae47ce
|
Auto-updated build strings.
|
2017-11-29 00:01:11 +01:00 |
|
Arturo Gonzalez
|
64b926e482
|
Added qw perms
|
2017-11-28 13:36:33 +01:00 |
|
Arturo Gonzalez
|
3ffbb7ed85
|
Added lost map info
|
2017-11-28 12:06:45 +01:00 |
|
artica
|
406c69d5be
|
Auto-updated build strings.
|
2017-11-28 00:01:13 +01:00 |
|
fbsanchez
|
f3b0f1708e
|
Minor fixes in PluginTools
Updated subroutine arguments to standar dev line
|
2017-11-27 18:19:32 +01:00 |
|
fbsanchez
|
dd764bc6e1
|
Minor fix in aws ec2 plugin
|
2017-11-27 18:19:06 +01:00 |
|
Arturo Gonzalez
|
459a5825ca
|
Fixed error generated in issue pandora_enterprise#110
|
2017-11-27 16:42:32 +01:00 |
|
Arturo Gonzalez
|
21bbfb557b
|
Added lost code
|
2017-11-27 15:00:59 +01:00 |
|
Arturo Gonzalez
|
192175a4cc
|
Added custom graphviz fields to map creation
|
2017-11-27 13:52:31 +01:00 |
artica
|
13e0221013
|
Updated version and build strings.
|
2017-11-27 12:24:02 +01:00 |
|
artica
|
6b79dc357d
|
Auto-updated build strings.
|
2017-11-27 00:01:09 +01:00 |
|
artica
|
0ced834c75
|
Auto-updated build strings.
|
2017-11-26 00:01:09 +01:00 |
|
artica
|
fd47d57ce2
|
Auto-updated build strings.
|
2017-11-25 00:01:11 +01:00 |
|
Arturo Gonzalez
|
a455ba666a
|
Added code to login with admin ldap user
|
2017-11-24 14:03:49 +01:00 |
|
vgilc
|
7b3e71f79a
|
Merge branch 'feature/safe_mode_module' into 'develop'
Filter by id_agente_modulo when evaluating safe mode operation.
See merge request artica/pandorafms!1116
|
2017-11-24 12:11:11 +01:00 |