3545 Commits

Author	SHA1	Message	Date
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	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	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
enriquecd	a027defccd	Make help and support links in login page customizables - #1709	2017-12-20 19:14:05 +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	a14c91dfa0	Add tinymce buttons to header a footer editor in visual styles - #1420	2017-12-15 12:29:13 +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
daniel	bec91f39cc	add new field external link login user	2017-12-14 13:28:46 +01:00
daniel	08797d9cc9	fixed minor error	2017-12-14 10:21:24 +01:00
danielmaya	14d5bb04c1	Fixed group status icon	2017-12-13 17:10:05 +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	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
enriquecd	4ad0085602	Update metaconsole after agent bulk operations for update - #1674	2017-12-12 17:58:06 +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	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
Arturo Gonzalez	f96e8277a0	Added good relative path	2017-12-01 12:53:16 +01:00
enriquecd	521eb8f4cb	Add clocks to visual console - #1403	2017-12-01 12:14:56 +01:00
Arturo Gonzalez	edd648de29	Changed text	2017-12-01 09:10:20 +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
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
danielmaya	aeb3e73221	Fixed last contact in metaconsole users_setup	2017-11-29 17:42:57 +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	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	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
danielmaya	caa3539c4f	Fixed group recursion in bulk operation	2017-11-29 15:54:00 +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	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	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
danielmaya	1840d08f7a	Added help_tip in public url	2017-11-27 16:55:42 +01:00
Arturo Gonzalez	a455ba666a	Added code to login with admin ldap user	2017-11-24 14:03:49 +01:00
enriquecd	afd84ce74d	Change system audit log extended info to table format with change info - #1571	2017-11-24 10:59:44 +01:00
danielmaya	897d7bf258	Added type graph selection in container graph	2017-11-23 18:01:32 +01:00
fermin831	34da44f9fb	Added cron help	2017-11-23 17:00:59 +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
danielmaya	02d67835bd	Fixed copy item in visual console	2017-11-21 17:27:39 +01:00
danielmaya	53ff51d5bf	Hide and show fields in edit modules bulk	2017-11-21 11:56:32 +01:00
enriquecd	cc737e5120	Check empty SLA fields on SLA wizar create form - #1319	2017-11-20 11:49:13 +01:00
danielmaya	18ba88dae2	Fixed snmp interface wizard for switch dell powerconnect	2017-11-20 10:28:08 +01:00
enriquecd	69f44aae13	Fix preload background image in visual console builder - #1617	2017-11-17 12:28:52 +01:00
enriquecd	213e8e6d18	Fix Run performance tests checkbox in web analysis module updater - #1470	2017-11-16 11:52:51 +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
Enrique Camargo	02670bef03	Update visual_console_builder.editor.js	2017-11-15 16:05:34 +01:00
enriquecd	27e7a51006	Fix graph container permissions and graph acl - #1576	2017-11-15 11:31:17 +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	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	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
fermin831	78ef64ead2	Added resize functionality to flot graphs and fix overview in container graphs	2017-11-14 18:44:29 +01:00
enriquecd	089a0f94ea	Change texts in pandora - #1257	2017-11-14 11:37:49 +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
Alejandro Gallardo Escobar	d0ec4bb4bc	[Console] Changed the link to the eHorus page into the setup	2017-11-13 11:32:14 +01:00
vgilc	3493b9c15c	Revert "code backup" ... This reverts commit b9851a3a71	2017-11-13 10:21:38 +01:00
Arturo Gonzalez	49df1e448a	Added changes from donut graph	2017-11-13 09:59:00 +01:00
Arturo Gonzalez	110945bccf	Added the last change to load string modules	2017-11-13 09:35:24 +01:00
Arturo Gonzalez	eb39d25c4b	Added field to get string modules	2017-11-10 15:03:52 +01:00
fermin831	2216b49e30	Fixed ghost menu	2017-11-08 19:37:21 +01:00
Arturo Gonzalez	fac066debd	Added groups acl in all visual console elements	2017-11-08 15:01:44 +01:00
Arturo Gonzalez	c9d1fab036	Added new system of calculate status if user set a parent weight	2017-11-08 12:49:03 +01:00
Arturo Gonzalez	092c43bede	Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev ... 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	2017-11-08 10:27:44 +01:00
Arturo Gonzalez	3de0e38c2d	Added color to resume data	2017-11-08 10:21:09 +01:00
Arturo Gonzalez	b9b8b37abe	Added grid color to bars graph in visual console	2017-11-08 09:55:36 +01:00
daniel	29c69b1dbc	add send mail plain/text	2017-11-07 11:43:46 +01:00
vgilc	7e6cc539e8	Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop' ... Fixed problems with unit See merge request artica/pandorafms!1027	2017-11-07 11:23:02 +01:00
vgilc	47171418cd	Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop' ... Modified simple value See merge request artica/pandorafms!1026	2017-11-07 11:22:28 +01:00
Arturo Gonzalez	31577a823c	Fixed problems with unit	2017-11-07 10:57:30 +01:00
Arturo Gonzalez	94a9bcb85b	Modified simple value	2017-11-07 10:26:26 +01:00
vgilc	2d87172558	Merge branch 'vulnerabilidad-en-consola' into 'develop' ... Resolve: Vulnerabilidad en consola See merge request artica/pandorafms!1020	2017-11-06 17:41:45 +01:00
vgilc	bbecd1af09	Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop' ... Fixed password entities in snmp walk See merge request artica/pandorafms!1014	2017-11-03 13:49:40 +01:00
danielmaya	7c78cd2a34	Fixed password entities in snmp walk	2017-11-03 13:18:00 +01:00
danielmaya	d198cbf597	Fixed order by remote	2017-11-02 17:23:57 +01:00
enriquecd	f0fe30fc3a	Now can create static graphs a group items without images, fix bugs - #1407	2017-11-02 15:54:18 +01:00
vgilc	594b6e9417	Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' ... 1320 exportación csv saca entities dev See merge request artica/pandorafms!1007	2017-11-02 15:35:38 +01:00
vgilc	a7e1e877e7	Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop' ... 654 cambios en informes de maximo minimo y media 4480 cherry See merge request artica/pandorafms!994	2017-10-31 12:13:55 +01:00
Daniel Maya	b9851a3a71	code backup	2017-10-31 11:51:19 +01:00
nramon	4e672cc758	Merge branch '655-module_data_increment_new_type_of_report' into 'develop' ... 655 module data increment new type of report See merge request artica/pandorafms!519	2017-10-31 08:18:26 +01:00
Alejandro Gallardo Escobar	849eba10d4	[Console] Fixed a vulnerability into the 'fgraph.php' script	2017-10-30 18:03:09 +01:00
enriquecd	f608c686b8	Graph and table mode for max, min and avg reports an template reports - #654	2017-10-30 17:23:59 +01:00
nramon	8163200f54	Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" ... This reverts merge request !871	2017-10-30 16:11:58 +01:00
nramon	65ae5ed2eb	Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' ... Graph and table mode for max, min and avg reports and template reports - #654 See merge request artica/pandorafms!871	2017-10-30 15:51:51 +01:00
nramon	70763ada3b	Merge branch 'develop' into '1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2' ... # Conflicts: # pandora_console/godmode/reporting/visual_console_builder.editor.js	2017-10-30 15:32:32 +01:00
nramon	7bc959ef41	Merge branch '1205-Editar-OID-desde-operaciones-masivas-4406-Northern' into 'develop' ... Add snmp oid field in module bulk operations - #1205 See merge request artica/pandorafms!807	2017-10-30 15:27:34 +01:00
enriquecd	f4fc23cb64	Merge branch 'develop' into 1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2 ... Conflicts: pandora_console/godmode/reporting/visual_console_builder.editor.js	2017-10-30 15:21:46 +01:00
enriquecd	32f5db5934	Merge branch 'develop' into 1205-Editar-OID-desde-operaciones-masivas-4406-Northern ... Conflicts: pandora_console/godmode/massive/massive_edit_modules.php	2017-10-30 15:19:49 +01:00
enriquecd	d98ee0d0bd	Merge branch 'develop' into 1406-Visual-consoles-e-imagenes-HTML-4623-com1 ... Conflicts: pandora_console/godmode/reporting/visual_console_builder.editor.js	2017-10-30 13:27:40 +01:00
Arturo Gonzalez	9145811d29	Added final lost code	2017-10-27 10:40:58 +02:00
Arturo Gonzalez	139db28eca	Added lost code	2017-10-26 16:13:27 +02:00
vgilc	b96b50129c	Merge branch '1103-Opciones-copiar-cortar-pegar-editor-de-etiquetas-de-la-consola-visual' into 'develop' ... Now the label editor color is changed by the mouse scroll - #1103 See merge request artica/pandorafms!802	2017-10-26 15:48:33 +02:00
Arturo Gonzalez	eb99b0a885	Added lost code	2017-10-26 15:37:43 +02:00
Arturo Gonzalez	802cb3ef5e	Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev	2017-10-26 14:41:07 +02:00
Arturo Gonzalez	5a59f9e2a5	Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev	2017-10-26 14:20:35 +02:00