12294 Commits

Author	SHA1	Message	Date
slerena	f820a1db94	Merge branch 'Ordenar-en-seccion-user-dev' into 'develop' ... Fixed last contact in metaconsole users_setup See merge request artica/pandorafms!1134	2017-11-30 12:37:19 +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
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
danielmaya	aeb3e73221	Fixed last contact in metaconsole users_setup	2017-11-29 17:42:57 +01:00
vgilc	2531e43d4a	Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop' ... Change phrases in system logfile viewer - #1263 See merge request artica/pandorafms!968	2017-11-29 17:03:42 +01:00
vgilc	7947a1797c	Merge branch 'consola-visual-muestra-entities-en-el-textarea-donde-muestra-el-ultimo-evento-que-hace-saltar-la-consola' into 'develop' ... Fixed the HTML entities problem of the sound events view See merge request artica/pandorafms!953	2017-11-29 17:02:50 +01:00
vgilc	3a4ed1671b	Merge branch '1410-Traducción-en-filtro-de-Alertas' into 'develop' ... Change manage alerts list enabled / disabled select text - #1410 See merge request artica/pandorafms!973	2017-11-29 16:59:57 +01:00
vgilc	0e4c17cf1e	Merge branch '1412-Filtro-por-más-campos-en-Manage-agents-2' into 'develop' ... Add new fields to filter in search input text and operative selector filter - #1412 See merge request artica/pandorafms!972	2017-11-29 16:59:27 +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	b0eb815e8e	Merge branch '1224-No_funciona_el_boton_de_restablecer_campos_por_defecto_en_el_configurador_de_columnas_del_visor_de_eventos' into 'develop' ... fixed error in event fields See merge request artica/pandorafms!935	2017-11-29 16:55:48 +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	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	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
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	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
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
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
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
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