7856 Commits

Author	SHA1	Message	Date
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
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
fbsanchez	acfccd37ae	Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479	2017-12-04 16:12:43 +01:00
danielmaya	a024d66fd7	Changed email by mail in mysql	2017-12-04 12:20:13 +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	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	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
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
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
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	c7676d7f4a	Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open' into 'develop' ... Add hide no data item checkbox to report templates - open - #1326 See merge request artica/pandorafms!940	2017-11-30 12:57:59 +01:00
enriquecd	628d5d2c62	Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open	2017-11-30 12:09:53 +01:00
enriquecd	4f3f2525e1	Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas ... Conflicts: pandora_console/include/help/en/help_alert_config.php pandora_console/include/help/en/help_alert_macros.php pandora_console/include/help/es/help_alert_config.php pandora_console/include/help/es/help_alert_macros.php	2017-11-30 11:47:47 +01:00
Arturo Gonzalez	30c879b600	Added more changes to improve radial dynamic maps	2017-11-30 10:45:28 +01:00
Arturo Gonzalez	fbab43b451	In progress	2017-11-30 08:04:56 +01:00
artica	d8ee188b95	Auto-updated build strings.	2017-11-30 00:01:12 +01:00
danielmaya	3adb990970	Fixed redeclare function	2017-11-29 18:11:40 +01:00
vgilc	43308596c1	Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop' ... added Search in custom fields See merge request artica/pandorafms!969	2017-11-29 16:57:32 +01:00
vgilc	df5722e499	Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop' ... Change font family to install wizard button - #1500 See merge request artica/pandorafms!964	2017-11-29 16:57:03 +01:00
vgilc	93c0ddfad4	Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop' ... Removed last value on visual console boolean static graphs See merge request artica/pandorafms!1053	2017-11-29 16:56:36 +01:00
vgilc	66d15f3e4f	Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop' ... Added autodisable mode help See merge request artica/pandorafms!976	2017-11-29 16:55:24 +01:00
vgilc	55e93d8fc9	Merge branch 'ent-1418-error-cuando-mysql-no-esta-levantado' into 'develop' ... Fixed console error 500 when mysql is not running See merge request artica/pandorafms!959	2017-11-29 16:54:58 +01:00
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	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	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	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	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	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	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
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
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