12570 Commits

Author	SHA1	Message	Date
enriquecd	3ee088da81	Fix default custom logo select value in visual settings for front of reports - #1725	2017-12-21 15:14:22 +01:00
enriquecd	26d115a84e	Merge branch 'develop' into 1470-Editar-modulo-web-analysis ... Conflicts: pandora_console/include/functions_ui.php	2017-12-21 14:37:55 +01:00
enriquecd	5747299d8e	Add visual effect to login page - #1724	2017-12-21 13:45:57 +01:00
fermin831	5b3408bae5	Added some lost help macros	2017-12-21 13:11:45 +01:00
fermin831	8e2616e642	Merge branch 'develop' into ent-1536-macro-para-id-extra	2017-12-21 12:18:58 +01:00
danielmaya	9c764dcf94	Autenticación LDAP	2017-12-21 11:35:02 +01:00
fermin831	9a43f1fa7d	Merge branch 'develop' into ent-1536-macro-para-id-extra ... Conflicts resolved: 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 pandora_console/include/help/ja/help_alert_config.php pandora_console/include/help/ja/help_alert_macros.php	2017-12-21 11:10:38 +01:00
vgilc	6ac8571b2d	Merge branch '979-CLI/API-Para-sincronizar-la-metaconsola' into 'develop' ... Metaconsole synchronization for api - #979 See merge request artica/pandorafms!1057	2017-12-21 11:00:09 +01:00
vgilc	db55901bf5	Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop' ... Change license windows style - #1437 See merge request artica/pandorafms!1048	2017-12-21 10:58:46 +01:00
vgilc	5332236a10	Merge branch 'ent-1445-ficheros-orig' into 'develop' ... Delete orig repo files See merge request artica/pandorafms!1069	2017-12-21 10:58:09 +01:00
vgilc	d9884fd431	Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop' ... Resolve: "Actualizar el cliente de eHorus" See merge request artica/pandorafms!1055	2017-12-21 10:57:15 +01:00
vgilc	6325e336c5	Merge branch 'ent-1580-flecha-de-interface-information-casi-no-se-ve' into 'develop' ... Fixed dark arrow in Interface information (SNMP) See merge request artica/pandorafms!1087	2017-12-21 10:55:40 +01:00
vgilc	e6d7cc1632	Merge branch '1253-Error-en-icono-grupo-Consola-Visual-metaconsola' into 'develop' ... Change group items url links in metaconsole - #1253 See merge request artica/pandorafms!1066	2017-12-21 10:53:03 +01:00
vgilc	e5c4dc4778	Merge branch '1319-Unsuccessfull-action-open' into 'develop' ... Check empty SLA fields on SLA wizar create form - #1319 See merge request artica/pandorafms!1096	2017-12-21 10:52:35 +01:00
vgilc	8ea951a4bb	Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' ... Fixed non interactive status graphs See merge request artica/pandorafms!1063	2017-12-21 10:48:17 +01:00
vgilc	97fc2dc4d1	Merge branch '1532-edición-de-módulos-a-través-de-operaciones-masivas-dev' into 'develop' ... Hide and show fields in edit modules bulk See merge request artica/pandorafms!1102	2017-12-21 10:47:53 +01:00
vgilc	c8b8f147e9	Merge branch '1572-Descripción-de-interfaces-en-switch-dell-powerconnect-Wizard-SNMP-interfaces-dev' into 'develop' ... Fixed snmp interface wizard for switch dell powerconnect See merge request artica/pandorafms!1094	2017-12-21 10:47:31 +01:00
vgilc	b8615d8a29	Merge branch '1574-Fallo-JS-con-cabeceras-POST' into 'develop' ... Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574 See merge request artica/pandorafms!1084	2017-12-21 10:47:08 +01:00
vgilc	097bc3df32	Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop' ... Added resize functionality to flot graphs and fix overview in container graphs See merge request artica/pandorafms!1068	2017-12-21 10:46:42 +01:00
vgilc	0c8315ec9f	Merge branch 'ent-1581-graficas-de-interfaces-se-abren-mal' into 'develop' ... Fixed first click on interface graphs See merge request artica/pandorafms!1070	2017-12-21 10:46:02 +01:00
vgilc	7938f6e65e	Merge branch '1617-Consola-visual-Previsualización-background-no-carga-imagen' into 'develop' ... Fix preload background image in visual console builder - #1617 See merge request artica/pandorafms!1090	2017-12-21 10:44:03 +01:00
vgilc	477d3c3d0f	Merge branch '1621-Imagen-rota-en-barra-de-consola-visual-publica' into 'develop' ... Fix qr button image in public viusal console - #1621 See merge request artica/pandorafms!1093	2017-12-21 10:43:42 +01:00
vgilc	3dad6d1837	Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles' into 'develop' ... Only average token for graphs fix - #1460 See merge request artica/pandorafms!1040	2017-12-21 10:42:12 +01:00
vgilc	733564dcb1	Merge branch 'default-mobile-page' into 'develop' ... [Pandora Console > Mobile] Added support to the user's default page See merge request artica/pandorafms!1091	2017-12-21 10:41:24 +01:00
vgilc	9971b2648d	Merge branch 'hacer-filtro-agentes-persistente' into 'develop' ... Resolve: "[Mobile console] Now the agents filter persists between the list and detail view" See merge request artica/pandorafms!1101	2017-12-21 10:41:00 +01:00
vgilc	60486c8a1e	Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop' ... Fixed reporting_event_report_module in metaconsole See merge request artica/pandorafms!1128	2017-12-21 09:53:47 +01:00
vgilc	45c642a6a0	Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop' ... Ent 1435 incluir macros en event responses See merge request artica/pandorafms!1100	2017-12-21 09:46:55 +01:00
vgilc	d9b3703aad	Merge branch '1582-Auto-disable-mode-en-operaciones-masivas-dev' into 'develop' ... Added Autodisable mode in bulk operation See merge request artica/pandorafms!1060	2017-12-21 09:07:49 +01:00
vgilc	e89363582a	Merge branch '1596-4876-Dropdown-menus-por-orden-de-ID' into 'develop' ... Order by name group select in manage agent view - #1596 See merge request artica/pandorafms!1078	2017-12-21 09:06:21 +01:00
vgilc	349a9bbd35	Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop' ... Change time format in agent events 24h bar view and show the last start time - #1613 See merge request artica/pandorafms!1089	2017-12-21 09:04:55 +01:00
vgilc	4f0a451ba1	Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop' ... 1576 permisos sobre gráficas no permite ver graph containers 4863 media open See merge request artica/pandorafms!1072	2017-12-21 08:59:36 +01:00
vgilc	c98e94e59e	Merge branch '1626-Fallo-al-clonar-item-de-la-consola-visual-dev' into 'develop' ... Fixed copy item in visual console See merge request artica/pandorafms!1106	2017-12-21 08:56:17 +01:00
artica	9b40ee6422	Auto-updated build strings.	2017-12-21 00:01:25 +01:00
artica	6db5ced911	Auto-updated build strings.	2017-12-20 00:01:11 +01:00
enriquecd	ff462e7b44	Translations - #1257	2017-12-19 16:11:35 +01:00
daniel	a335732267	fixed errors in graphs webproc and keep alive	2017-12-19 13:13:42 +01:00
daniel	fd66f84d0b	fixed minor errors	2017-12-19 09:57:52 +01:00
artica	b4d643f08f	Auto-updated build strings.	2017-12-19 00:01:46 +01:00
danielmaya	146802119d	Fixed pdf label	2017-12-18 16:50:24 +01:00
vgilc	4712205091	Merge branch 'ent-1569-menu-fantasma-con-pandora-en-castellano' into 'develop' ... Fixed ghost menu See merge request artica/pandorafms!1046	2017-12-18 13:41:35 +01:00
enriquecd	e5ce6ee631	Let use translate strings extension in login page - #1706	2017-12-18 13:34:18 +01:00
artica	e895d06016	Updated version and build strings.	2017-12-18 13:26:41 +01:00
danielmaya	b65d649750	Fixed reporting custom graph	2017-12-18 13:12:29 +01:00
artica	ee1b915735	Auto-updated build strings.	2017-12-18 00:01:13 +01:00
artica	925eb1cf72	Auto-updated build strings.	2017-12-17 00:01:13 +01:00
artica	7a0617ccce	Auto-updated build strings.	2017-12-16 00:01:13 +01:00
artica	671ac77e44	Auto-updated build strings.	2017-12-15 00:01:16 +01:00
enriquecd	0473bda9b5	Fix os sorting in manage agents when use pagination - #1412	2017-12-14 17:28:33 +01:00
enriquecd	74461bfd7f	Change Csutom value textarea rows in snmp alert editor - #1704	2017-12-14 16:58:46 +01:00
vgilc	9a96103164	Merge branch '1257-Traducciones-consola-open' into 'develop' ... Change texts in pandora - #1257 See merge request artica/pandorafms!1062	2017-12-14 15:56:54 +01:00
vgilc	9ee705f438	Merge branch '1703-carrefour-metaconsola-anadir-el-campo-enlace-externo-a-la-pantalla-de-inicio-de-usuarios' into 'develop' ... add new field external link login user See merge request artica/pandorafms!1183	2017-12-14 15:55:13 +01:00
enriquecd	db9dc114fb	Visual console status calculate errors / 2 - #1698	2017-12-14 15:14:46 +01:00
daniel	bec91f39cc	add new field external link login user	2017-12-14 13:28:46 +01:00
enriquecd	585da6de6b	Visual console status calculate errors - #1698	2017-12-14 12:42:21 +01:00
enriquecd	790b5b5da6	Redirect to real url when login - #1694	2017-12-14 12:11:49 +01:00
daniel	08797d9cc9	fixed minor error	2017-12-14 10:21:24 +01:00
artica	3598f13687	Auto-updated build strings.	2017-12-14 00:01:16 +01:00
daniel	d7d1cfe81b	Merge branch 'develop' into 1632-Pandora_FMS_charts	2017-12-13 17:18:36 +01:00
daniel	4a1a0ae8b7	fixed errors in graphs	2017-12-13 17:17:45 +01:00
enriquecd	d0d0f8b229	Fix custom graph builder order bar - #1382	2017-12-13 13:08:41 +01:00
danielmaya	43e697a1cb	Added hint in field Add summatory series	2017-12-13 11:50:15 +01:00
danielmaya	85ac142c6c	Updated functions_graph and fixed percentil issue	2017-12-13 10:38:08 +01:00
danielmaya	1d3efb9d9e	Updated functions_graph	2017-12-13 10:37:42 +01:00
danielmaya	61b33221bf	Added check modules and series	2017-12-13 10:37:23 +01:00
Daniel Maya	e01f00ac3d	code backup	2017-12-13 10:36:08 +01:00
artica	1b32a4da7c	Auto-updated build strings.	2017-12-13 00:01:14 +01:00
vgilc	6a0acb05f1	Merge branch '1684-Autenticacion-por-LDAP-con-mas-de-1000-usuarios-dev' into 'develop' ... Added ldapsearch system command See merge request artica/pandorafms!1173	2017-12-12 14:20:22 +01:00
vgilc	02378cbea2	Merge branch 'ent-1687-no-mostrar-valor-de-modulos-keepalive-en-static-graphs-carrefour' into 'develop' ... keepalive modules are boolean too (console function fix) See merge request artica/pandorafms!1170	2017-12-12 09:01:14 +01:00
artica	3d233645c5	Auto-updated build strings.	2017-12-12 00:01:14 +01:00
danielmaya	741df27ba0	Added ldapsearch system command	2017-12-11 17:19:52 +01:00
enriquecd	b6b0c8532d	Carrefour auto loginhash existing session - #1679	2017-12-11 16:30:09 +01:00
fermin831	84ff86fede	keepalive modules are boolean too (console function fix)	2017-12-11 15:47:38 +01:00
artica	6b76392a60	Auto-updated build strings.	2017-12-11 00:01:12 +01:00
artica	4734283cd8	Auto-updated build strings.	2017-12-10 00:01:11 +01:00
artica	e1583f1903	Auto-updated build strings.	2017-12-09 00:01:11 +01:00
artica	3804c3f826	Auto-updated build strings.	2017-12-08 00:01:13 +01:00
artica	633cb5a39c	Auto-updated build strings.	2017-12-07 00:01:14 +01:00
artica	044d54a76f	Auto-updated build strings.	2017-12-06 00:01:15 +01:00
vgilc	5b5ed2c45b	Merge branch '1657-Agentes-en-crítico-salen-como-desconocido-en-GIS-dev' into 'develop' ... Fixed Unkwon Icon in GIS See merge request artica/pandorafms!1147	2017-12-05 16:55:06 +01:00
vgilc	a4cf584468	Merge branch '1671-Filtro-en-mapas-gis-dev' into 'develop' ... Fixed filter in gis maps See merge request artica/pandorafms!1154	2017-12-05 16:54:35 +01:00
daniel	fedb6003dd	fixed errors in TIP	2017-12-05 13:46:23 +01:00
daniel	06c1c4f243	fixed errors in fullscale graph and normal graph	2017-12-05 13:44:42 +01:00
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
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
enriquecd	afcd03658e	Fix sending mails for reports an templates reports by cronjobs - #1611	2017-12-05 11:40:41 +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
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
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
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
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
Arturo Gonzalez	031196782b	Fixed update map	2017-11-30 16:50:10 +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	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	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
nramon	cf01084873	Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop' ... Add order items setting bar to graph editor - #1382 See merge request artica/pandorafms!961	2017-11-30 13:12:25 +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	688736288c	Change treport_content_template fileds order - #1326	2017-11-30 12:46:29 +01:00
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	097bc39d74	Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql	2017-11-30 12:28:21 +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	6075c9b6b9	1326 / 1382 - Mr 10 changes	2017-11-30 11:55:11 +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
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