12513 Commits

Author	SHA1	Message	Date
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
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
danielmaya	a3e47fb977	Fixed reporting_event_report_module in metaconsole	2017-11-28 15:56:46 +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
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
Alejandro Gallardo Escobar	9796b4b4a0	[Console > Network map] Fix the output of content with html entities	2017-11-24 14:23:09 +01:00
Arturo Gonzalez	a455ba666a	Added code to login with admin ldap user	2017-11-24 14:03:49 +01:00
Arturo Gonzalez	2883e45849	Added changes to get all hierachy to the chart	2017-11-24 12:08:15 +01:00
Arturo Gonzalez	06f83825dc	Added code to fix agents generation in sunbrust chart	2017-11-24 11:27:10 +01:00
vgilc	3bc4bdb798	Merge branch '1471-fallo-enlace-publico-dashboards-2' into 'develop' ... Fixed tree view on public dashboards See merge request artica/pandorafms!1114	2017-11-24 09:38:34 +01:00
artica	b6dfc147f3	Auto-updated build strings.	2017-11-24 00:01:11 +01:00
fermin831	fdd168007b	Fixed tree view on public dashboards	2017-11-23 18:38:22 +01:00
vgilc	ebc35ae791	Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-3' into 'develop' ... Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 3 See merge request artica/pandorafms!1112	2017-11-23 17:44:25 +01:00
fermin831	34da44f9fb	Added cron help	2017-11-23 17:00:59 +01:00
Alejandro Gallardo Escobar	dc579f6bbe	[Console] Fixed the graph popup size in Firefox	2017-11-23 13:51:43 +01:00
Alejandro Gallardo Escobar	279a864d82	[Console] Adjustments to the graph popup size	2017-11-23 12:53:54 +01:00
fermin831	00bdcf5996	Added new cron functions to console	2017-11-23 12:30:04 +01:00
vgilc	62ffb46763	Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop' ... Fixed public dashboard permissions See merge request artica/pandorafms!1004	2017-11-23 09:03:07 +01:00
artica	1ce4adb54e	Auto-updated build strings.	2017-11-23 00:01:12 +01:00
Fco de Borja Sánchez	afab4be2af	Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479	2017-11-22 12:34:03 +01:00
vgilc	0de711e633	Merge branch '1486-4739-Aumentar-caja-donde-se-muestran-los-nombre-de-las-interfaces-en-el-SNMP-Interface-Wizard' into 'develop' ... Change width of snmp interface wizard select box - #1486 See merge request artica/pandorafms!962	2017-11-22 10:13:16 +01:00
artica	b4ba8acaa2	Auto-updated build strings.	2017-11-22 00:01:11 +01:00
enriquecd	0334a32423	Visual inprovement in alerts system window - #1633	2017-11-21 19:28:44 +01:00
danielmaya	02d67835bd	Fixed copy item in visual console	2017-11-21 17:27:39 +01:00
fermin831	0f814c0b63	Added public dashboard authentication to some components	2017-11-21 16:59:49 +01:00
vgilc	1eb509371d	Merge branch '1509-Ayudas-en-nuevos-elementos-de-la-consola-visual-dev' into 'develop' ... Added help elements See merge request artica/pandorafms!1105	2017-11-21 16:56:00 +01:00
Arturo Gonzalez	3495bb5cbf	Added help elements	2017-11-21 16:47:45 +01:00
Arturo Gonzalez	a819efbdb8	Added graphviz values to calibrate maps	2017-11-21 13:18:06 +01:00
danielmaya	53ff51d5bf	Hide and show fields in edit modules bulk	2017-11-21 11:56:32 +01:00
Arturo Gonzalez	f4d035cfa5	Added changes to filter by group. Not finished	2017-11-21 10:27:17 +01:00
artica	ae6df5a24e	Auto-updated build strings.	2017-11-21 00:01:13 +01:00
Alejandro Gallardo Escobar	979a27f794	[Mobile console] Now the agents filter persists between the list and detail view	2017-11-20 16:44:28 +01:00
fermin831	f021664336	Added new events response macros documentation	2017-11-20 15:06:20 +01:00
vgilc	2502944dea	Merge branch '1614-Pete-SQL-en-buscador-consolas-visuales-dev' into 'develop' ... Fixed revert in functions_visual_map.php See merge request artica/pandorafms!1097	2017-11-20 13:10:17 +01:00
danielmaya	faa4d5169a	Fixed revert in functions_visual_map.php	2017-11-20 13:01:10 +01:00
fermin831	76685aefe0	Added help documentation to _event_extra_id_	2017-11-20 12:54:32 +01:00
enriquecd	cc737e5120	Check empty SLA fields on SLA wizar create form - #1319	2017-11-20 11:49:13 +01:00
fermin831	2425d19ddd	Fixed typo	2017-11-20 11:16:18 +01:00
fermin831	2ef9d884ee	Added spanish event responses new macros documentation	2017-11-20 11:14:26 +01:00
daniel	3d4485438d	fixed error visual console remove link when edit console	2017-11-20 10:37:07 +01:00
danielmaya	18ba88dae2	Fixed snmp interface wizard for switch dell powerconnect	2017-11-20 10:28:08 +01:00
artica	04c271ae61	Auto-updated build strings.	2017-11-20 00:01:08 +01:00
artica	92b71b17f4	Auto-updated build strings.	2017-11-19 00:01:09 +01:00
artica	1fb39ee151	Auto-updated build strings.	2017-11-18 00:01:11 +01:00
enriquecd	59b5d64486	Fix qr button image in public viusal console - #1621	2017-11-17 15:18:44 +01:00
fermin831	492b55a713	Added custom_data to events responeses macros	2017-11-17 15:17:08 +01:00
fermin831	7fb8406bc0	Added several macros to events responses	2017-11-17 14:50:23 +01:00
Alejandro Gallardo Escobar	b6470a0e98	[Pandora Console > Mobile] Added support to the user's default page	2017-11-17 12:29:52 +01:00
enriquecd	69f44aae13	Fix preload background image in visual console builder - #1617	2017-11-17 12:28:52 +01:00
enriquecd	1f2f8fdc0c	Change time format in agent events 24h bar view and show the last start time - #1613	2017-11-17 11:44:38 +01:00
vgilc	215d3c005f	Merge branch '1457-selectores-de-posicion-y-zoom-en-mapas-de-red-dev' into 'develop' ... Added new map center See merge request artica/pandorafms!1086	2017-11-17 10:07:48 +01:00
artica	c624c213ea	Auto-updated build strings.	2017-11-17 00:01:11 +01:00
fermin831	49411f17e4	Fixed dark arrow in Interface information (SNMP)	2017-11-16 15:35:26 +01:00
Arturo Gonzalez	fc9e78c301	Added new map center	2017-11-16 13:43:51 +01:00
danielmaya	ede677f07c	Added safe_mode_module in metaconsole	2017-11-16 13:38:59 +01:00
vgilc	9fdd95ad0d	Merge branch '1539-pantalla-en-blanco-al-crear-mapas-de-red-radial-dinamic-dev' into 'develop' ... 1539 pantalla en blanco al crear mapas de red radial dinamic dev See merge request artica/pandorafms!1083	2017-11-16 12:48:03 +01:00
enriquecd	e902baaf9d	Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574	2017-11-16 12:46:19 +01:00
enriquecd	eedd6407b5	Apply Safe input to ui_get_url_refresh function return - #1574	2017-11-16 12:11:07 +01:00
Arturo Gonzalez	f665fe9d07	Added empty maps to flow	2017-11-16 12:10:37 +01:00
Arturo Gonzalez	06d47e03db	Added dinamic to new flow	2017-11-16 12:03:20 +01:00
enriquecd	213e8e6d18	Fix Run performance tests checkbox in web analysis module updater - #1470	2017-11-16 11:52:51 +01:00
Alejandro Gallardo Escobar	2dd0dbbcc9	Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional	2017-11-16 10:59:01 +01:00
Alejandro Gallardo Escobar	ec48829c71	[DB] Added a missing coma	2017-11-16 10:55:01 +01:00
vgilc	35a412fd7c	Merge branch '1505-acl-de-grupos-en-consola-visual-dev' into 'develop' ... Added acl group to visual console status elements See merge request artica/pandorafms!1081	2017-11-16 10:44:22 +01:00
Arturo Gonzalez	76576899f9	Added acl group to visual console status elements	2017-11-16 10:37:46 +01:00
Alejandro Gallardo Escobar	f2ad76636c	Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional ... Conflicts resolved: pandora_console/extras/mr/9.sql	2017-11-16 09:49:11 +01:00
vgilc	c46375e3e3	Merge branch '1313-cambio-en-mr-para-mostrar-elementos-al-frente-en-consolas-visuales-dev' into 'develop' ... Added sql to MR See merge request artica/pandorafms!1080	2017-11-16 08:53:32 +01:00
Arturo Gonzalez	b565500182	Added sql to MR	2017-11-16 08:32:39 +01:00
Arturo Gonzalez	bcc6672cdf	Merge branch 'develop' into 1612-se-borran-elementos-al-mover-un-item-en-consola-visual-dev ... Conflicts: pandora_console/include/ajax/visual_console_builder.ajax.php	2017-11-16 08:09:05 +01:00
Arturo Gonzalez	1a4597874a	Fixed move function	2017-11-16 08:06:52 +01:00
artica	104db9a875	Auto-updated build strings.	2017-11-16 00:01:12 +01:00
enriquecd	8fa2acfd2a	Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2 ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/reporting/visual_console_builder.editor.js pandora_console/pandoradb.sql	2017-11-15 17:35:51 +01:00
enriquecd	2a13f5fbf6	Order by name group select in manage agent view - #1596	2017-11-15 17:03:16 +01:00
vgilc	0618a2fd97	Merge branch 'requerimientos-sql-en-mr-dev' into 'develop' ... Added visual console querys See merge request artica/pandorafms!1077	2017-11-15 16:41:18 +01:00
vgilc	7ad2e7e227	Merge branch '1361-errores-de-version-anterior-en-mapas-de-red-dev' into 'develop' ... Fixed errors at update See merge request artica/pandorafms!1076	2017-11-15 16:16:25 +01:00
Arturo Gonzalez	b5cff77a4f	Added visual console querys	2017-11-15 16:10:43 +01:00
vgilc	30eb222118	Merge branch '1594-acceso-con-ldap-con-un-id-diferente-al-nombre-dev' into 'develop' ... 1594 acceso con ldap con un id diferente al nombre dev See merge request artica/pandorafms!1074	2017-11-15 16:09:03 +01:00
Enrique Camargo	8d42f7fec1	Update pandoradb.sql	2017-11-15 16:08:38 +01:00
Arturo Gonzalez	eb1789f08b	Fixed errors at update	2017-11-15 16:06:28 +01:00
Enrique Camargo	02670bef03	Update visual_console_builder.editor.js	2017-11-15 16:05:34 +01:00
Enrique Camargo	4eae50f0f1	Update pandoradb_migrate_6.0_to_7.0.mysql.sql	2017-11-15 16:03:39 +01:00
Arturo Gonzalez	0513a9e45a	Merge branch 'develop' into 1316-new-empty-networkmaps-dev ... Conflicts: pandora_console/include/functions_pandora_networkmap.php	2017-11-15 15:49:21 +01:00
Arturo Gonzalez	088aa51996	Added changes to obtain id from external php	2017-11-15 15:30:55 +01:00
vgilc	e91bcf8ad5	Merge branch '1597-pantalla-en-blanco-en-mapas-de-red-dev' into 'develop' ... Fixed null values in js See merge request artica/pandorafms!1073	2017-11-15 13:17:06 +01:00
Arturo Gonzalez	72acac8b57	Fixed null values in js	2017-11-15 12:19:41 +01:00
vgilc	a72f7b006e	Merge branch 'develop' into '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev' ... # Conflicts: # pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql	2017-11-15 12:04:11 +01:00
Arturo Gonzalez	59e1bdd225	Added email login attr to ldap users	2017-11-15 11:57:56 +01:00
Enrique Camargo	5c48dc9637	Update functions_container.php	2017-11-15 11:35:35 +01:00
enriquecd	27e7a51006	Fix graph container permissions and graph acl - #1576	2017-11-15 11:31:17 +01:00
danielmaya	66547d28b0	Updated to MR 9	2017-11-15 11:15:12 +01:00
fermin831	6e942fc0b9	Fixed first click on interface graphs	2017-11-15 11:02:42 +01:00
fbsanchez	b7a9731dd3	Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479	2017-11-15 10:39:13 +01:00
Arturo Gonzalez	1a4502d150	Added new field to ldap config	2017-11-15 10:27:56 +01:00
vgilc	93dd3c226f	Merge branch '1476-Los-elementos-no-se-quedan-centrados-en-las-consolas-visuales-dev' into 'develop' ... Fixed margin left and top in visual console See merge request artica/pandorafms!1050	2017-11-15 10:18:02 +01:00
vgilc	e8076645d0	Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev' ... # Conflicts: # pandora_console/extras/mr/9.sql	2017-11-15 09:47:21 +01:00
vgilc	faac4fa46f	Merge branch '1240-fictional-node-link-to-other-map-dev' into 'develop' ... Added function to update link to other map See merge request artica/pandorafms!990	2017-11-15 09:45:03 +01:00
Arturo Gonzalez	776aca90d6	Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev ... Conflicts: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/godmode/reporting/visual_console_builder.editor.js pandora_console/include/ajax/visual_console_builder.ajax.php pandora_console/include/functions_visual_map_editor.php pandora_console/pandoradb.sql	2017-11-15 09:43:33 +01:00
vgilc	8ebada6dbf	Merge branch '1464-error-in-networkmap-with-weird-agent-names-dev' into 'develop' ... Added safe input to agent name See merge request artica/pandorafms!996	2017-11-15 09:43:29 +01:00
vgilc	11d696f209	Merge branch '910-new-real-view-based-on-tags-dev' into 'develop' ... Added new section to menu See merge request artica/pandorafms!967	2017-11-15 09:41:17 +01:00
vgilc	d430375826	Merge branch '1413-CARREFOUR-Añadir-macros-en-los-label-de-las-consolas-visuales' into 'develop' ... Add visual console macros - #1413 See merge request artica/pandorafms!1019	2017-11-15 09:40:38 +01:00
vgilc	1789287673	Merge branch '1539-new-flow-in-networkmaps-when-creates-a-map-dev' into 'develop' ... Changed flow See merge request artica/pandorafms!1031	2017-11-15 09:39:31 +01:00
vgilc	7354ae534b	Merge branch 'snmp-browser-safe-output' into 'develop' ... Remove HTML entities from the SNMP community. See merge request artica/pandorafms!1037	2017-11-15 09:36:20 +01:00
vgilc	55ac22055b	Merge branch '1457-select-position-and-z-scale-in-networkmaps-dev' into 'develop' ... Added the options in networkmap editor See merge request artica/pandorafms!997	2017-11-15 09:35:19 +01:00
Arturo Gonzalez	4db2493cdd	Merge branch 'develop' into 1464-error-in-networkmap-with-weird-agent-names-dev ... Conflicts: pandora_console/include/functions_networkmap.php	2017-11-15 09:34:19 +01:00
vgilc	b12d529578	Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop' ... 1276 cascade protection a nivel de módulo dev See merge request artica/pandorafms!933	2017-11-15 09:31:05 +01:00
vgilc	4cafe69184	Merge branch 'optimizar-vista-de-eventos' into 'develop' ... [Console > Events view] Removed the events graph to improve ~75% the render time See merge request artica/pandorafms!1002	2017-11-15 09:30:38 +01:00
vgilc	90b99c491a	Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop' ... Added new system of calculate status if user set a parent weight See merge request artica/pandorafms!1043	2017-11-15 09:28:10 +01:00
vgilc	4e09334718	Merge branch '1592-acceso-con-ldap-sin-establecer-pass-dev' into 'develop' ... 1592 acceso con ldap sin establecer pass dev See merge request artica/pandorafms!1067	2017-11-15 09:27:39 +01:00
artica	e793e3fd4e	Auto-updated build strings.	2017-11-15 00:01:16 +01:00
fermin831	ae94be7779	Delete orig repo files	2017-11-14 19:37:00 +01:00
fbsanchez	0ea2475d60	minor fix pandora.flot.js	2017-11-14 19:02:13 +01:00
fermin831	78ef64ead2	Added resize functionality to flot graphs and fix overview in container graphs	2017-11-14 18:44:29 +01:00
Arturo Gonzalez	75cb2a668f	Added a lot of changes to save or not user password, only ldap	2017-11-14 16:20:26 +01:00
enriquecd	36c3f1fef6	Change group items url links in metaconsole - #1253	2017-11-14 13:51:33 +01:00
danielmaya	31d1f80a12	Fixed creating network components by snmpwalk	2017-11-14 13:31:39 +01:00
Arturo Gonzalez	8a1ba7130f	Added restriction to no pass token	2017-11-14 13:11:11 +01:00
Arturo Gonzalez	efa762626b	Changed text to new token	2017-11-14 12:47:23 +01:00
Arturo Gonzalez	861e112cec	Added token to pandora auth conf	2017-11-14 12:36:32 +01:00
fermin831	ff58a171e9	Fixed non interactive status graphs	2017-11-14 12:20:28 +01:00
enriquecd	089a0f94ea	Change texts in pandora - #1257	2017-11-14 11:37:49 +01:00
fbsanchez	958ef2bd38	Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 ... Added max/min thresholds to hbar graphs	2017-11-14 10:49:15 +01:00
danielmaya	e6d5adbf22	Changed MR	2017-11-14 10:38:50 +01:00
danielmaya	16eaf31c70	Added Autodisable mode in bulk operation	2017-11-14 10:21:55 +01:00
Arturo Gonzalez	274c551671	Added height to bars graph	2017-11-14 08:50:12 +01:00
artica	69aff8a420	Auto-updated build strings.	2017-11-14 00:01:10 +01:00
enriquecd	2f9f2ddf90	Metaconsole synchronization for api - #979	2017-11-13 16:37:08 +01:00
Arturo Gonzalez	833983e34e	Added visual changes to donut graph	2017-11-13 12:54:28 +01:00
danielmaya	14fe06e536	Fixed pagination errors with free search	2017-11-13 12:07:53 +01:00
Alejandro Gallardo Escobar	47cf03950a	[Console] Changed the authentication method of the eHorus integration	2017-11-13 12:03:01 +01:00
Alejandro Gallardo Escobar	b38c557491	[Console] Updated the eHorus client	2017-11-13 12:02:01 +01:00
Alejandro Gallardo Escobar	d0ec4bb4bc	[Console] Changed the link to the eHorus page into the setup	2017-11-13 11:32:14 +01:00