1990 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	d57e9c4f16	Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' ... Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar See merge request artica/pandorafms!5827	2023-05-17 08:05:09 +00:00
Alejandro Campos	097dc8ef12	Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' ... # Conflicts: # pandora_console/extras/mr/64.sql	2023-05-17 07:41:02 +00:00
Pablo Aragon	f4cf8e769a	11094-Fix plugin data recovery	2023-05-16 16:00:17 +02:00
Daniel Rodriguez	60c6d806e3	Merge branch 'ent-11082-fallos-con-creacion-de-servicios-usando-el-wizard' into 'develop' ... Ent 11082 fallos con creacion de servicios usando el wizard See merge request artica/pandorafms!5837	2023-05-16 09:51:24 +00:00
Daniel Rodriguez	a7b5015281	Merge branch 'ent-10972-error-de-visualizacion-en-creacion-de-alerta-correlada-condiciones-en-vista-simple-y-detallada' into 'develop' ... Ent 10972 error de visualizacion en creacion de alerta correlada condiciones en vista simple y detallada See merge request artica/pandorafms!5761	2023-05-16 08:40:15 +00:00
Daniel Maya	3b3a36a946	#11201 Fix select	2023-05-12 12:52:51 +02:00
Daniel Rodriguez	fe9194eccf	Merge branch 'ent-11085-15095-anadir-de-nuevo-la-opcion-insert-edit-link-en-label-settings-de-la-consola-visual-mas' into 'develop' ... Ent 11085 15095 anadir de nuevo la opcion insert edit link en label settings de la consola visual mas See merge request artica/pandorafms!5813	2023-05-12 08:44:48 +00:00
miguel angel rasteu	f8f53a0b62	#9610 Add OS filter and OS version filter in bulk operation	2023-05-09 13:01:42 +02:00
Matias Didier	ec2195f32f	Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop' ... Ent 11047 15490 no se pueden agregar mas campos a los plugins See merge request artica/pandorafms!5780	2023-05-09 08:18:40 +00:00
Pablo Aragon	886bde919b	11135-Move js code from ui_print_datatable	2023-05-08 14:25:57 +02:00
Daniel Cebrian	042591c57b	#9162 added new select for order columns in widgets	2023-05-08 10:35:59 +02:00
Jorge Rincon	82db353dd1	#11098 The operation of the create module button from the SNPM Walk modal is adjusted	2023-05-05 14:10:41 +02:00
miguel angel rasteu	b107069bf5	#11082 Fix JS code to show de name of the service	2023-05-05 10:09:14 +02:00
Jorge Rincon	9ab9087377	#11098 The Create agent module button is enabled	2023-05-04 16:48:20 +02:00
Pablo Aragon	4f9e09b84a	10815-Bulk operations do not edit modules created with policies	2023-05-03 17:01:21 +02:00
Pablo Aragon	134fa5b581	10625-Change timezone graphs	2023-05-03 11:01:28 +02:00
Jonathan	9da4f3d656	#11085 tinymce add plugins imagen link	2023-05-03 08:04:54 +02:00
Alejandro Campos	539ff07aec	Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' ... # Conflicts: # pandora_console/include/styles/pandora.css	2023-04-28 08:07:10 +00:00
Daniel Rodriguez	06b58d3dfc	Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' ... Ent 10191 nuevas alertas sonoras son poco usables See merge request artica/pandorafms!5689	2023-04-28 06:04:18 +00:00
alejandro.campos@artica.es	9f9aed4d77	add target ip field to remote components	2023-04-27 09:40:32 +02:00
Jonathan	d1361e38cb	#11047 fix macro in plugin section node+meta	2023-04-25 14:20:44 +02:00
Matias Didier	d7ee0ca2da	Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop' ... Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro See merge request artica/pandorafms!5736	2023-04-24 10:44:21 +00:00
Jonathan	55485c43b2	#10972 remove console.log fullcalendar.js	2023-04-24 07:51:00 +02:00
Jonathan	ec1eb38336	#10972 fix null calendar alerts correlation	2023-04-21 13:27:18 +02:00
Jonathan	a28aef4050	#10191 fix url sound event on metaconsole	2023-04-21 08:48:19 +02:00
Daniel Rodriguez	f5a7dd40e9	Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop' ... Ent 10490 theme base de tinymce See merge request artica/pandorafms!5649	2023-04-20 11:51:13 +00:00
alejandro.campos@artica.es	9553c42496	implemented agent deploy wizard	2023-04-19 19:21:38 +02:00
Daniel Rodriguez	063dbf07d6	Merge branch 'ent-10564-15146-bug-en-comentarios-de-eventos' into 'develop' ... fixed add commet event See merge request artica/pandorafms!5672	2023-04-19 10:45:50 +00:00
Daniel Maya	b39f4a2f04	#10910 Fix old image	2023-04-18 15:14:40 +02:00
Rafael Ameijeiras	852e7ae2a0	Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop' ... Ent 10714 mejoras de usabilidad en vista de inventario export csv See merge request artica/pandorafms!5726	2023-04-17 15:40:19 +00:00
Jonathan	cbf122f4c6	#10714 csv inventory button	2023-04-17 14:11:16 +02:00
Matias Didier	e4fd12f6de	Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop' ... Ent 10067 anadir filtro alerts triggered en tree view y widget tree view See merge request artica/pandorafms!5662	2023-04-17 11:06:10 +00:00
Pablo Aragon	0fa03f28b3	10067-Alerts triggered filter tree view	2023-04-16 20:21:29 +02:00
Matias Didier	250d65d94a	Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop' ... Ent 10740 mejoras en heatmap See merge request artica/pandorafms!5660	2023-04-13 08:24:18 +00:00
daniel	b186d51329	fix icons pandora_enterprise#10909	2023-04-12 17:06:58 +02:00
Daniel Maya	cd030620b2	#10909 Fix icon group 4	2023-04-12 15:51:02 +02:00
Jonathan	b36ade1821	#10191 fix url event sounds	2023-04-11 16:24:37 +02:00
Jonathan	c6c8e60b1d	#10191 no show old sound event modal	2023-04-11 15:04:21 +02:00
Jonathan	3a96c60bac	#10191 new event sound modal	2023-04-11 13:50:11 +02:00
daniel	ba1f299440	fixed add commet event	2023-04-10 10:35:47 +02:00
Pablo Aragon	5f6213f0f0	10863-Buttons Network maps	2023-04-05 14:15:23 +02:00
Rafael Ameijeiras	cc2709c42c	Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop' ... Ent 10699 errores en los mapas varios See merge request artica/pandorafms!5632	2023-04-05 06:47:31 +00:00
Daniel Maya	dc654c0b6d	#10740 heatmap improvements	2023-04-04 15:14:10 +02:00
Jonathan	000ab68327	#10490 TinyMCE Upgrade V6	2023-04-04 11:24:49 +02:00
Jonathan	4aaddf063c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-31 09:52:06 +02:00
Jonathan	93966788eb	Slides require mesage	2023-03-31 09:51:48 +02:00
Daniel Cebrian	f442272177	Merge branch 'develop' into ent-10633-pantalla-de-timeout	2023-03-30 09:30:38 +02:00
Daniel Cebrian	b9fc352578	merge develop into ent-10633-pantalla-de-timeout	2023-03-30 09:15:10 +02:00
Jonathan	ee0619cc4a	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-29 16:50:25 +02:00
Jonathan	8c3b5d650d	tree view dashboard metaconsole	2023-03-29 16:50:17 +02:00
Pablo Aragon	2b121a2fd2	New qrcode.js version & vcard	2023-03-29 15:34:03 +02:00
Daniel Maya	490e547202	#10699 Fixed central node	2023-03-28 11:03:59 +02:00
daniel	3d815d56c8	fixed styles	2023-03-28 08:45:40 +02:00
daniel	4e01838238	fixed styles	2023-03-28 08:43:46 +02:00
Diego Muñoz-Reja	6bdecc43e7	Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' ... Ent 8642 nuevo widget heatmap See merge request artica/pandorafms!5557	2023-03-27 10:43:48 +00:00
Pablo Aragon	95edb47d01	10408	2023-03-24 12:29:03 +01:00
daniel	95834b2de7	fixed styles	2023-03-23 12:41:39 +01:00
Daniel Maya	52231615f6	Merge branch 'develop' into ent-8642-nuevo-widget-heatmap	2023-03-23 11:51:54 +01:00
Pablo Aragon	904b526b30	Change pass login. Graph tree view width	2023-03-22 11:23:07 +01:00
Daniel Cebrian	bb794d603b	fixed button create tips and icon remove	2023-03-17 09:13:00 +01:00
Jonathan	c219ad91c7	Visual minor fix	2023-03-17 08:53:58 +01:00
Daniel Cebrian	f8f65bf5a1	fixed icon size	2023-03-16 17:26:48 +01:00
Daniel Cebrian	20b177d121	changed in welcome tips forms	2023-03-16 17:23:48 +01:00
daniel	a22b5479d9	fixed styles	2023-03-16 16:48:03 +01:00
Pablo Aragon	bed1e34fd2	Dashboards widgets	2023-03-15 15:58:28 +01:00
Daniel Cebrian	1b0477bd1f	Merge branch 'develop' into ent-10633-pantalla-de-timeout	2023-03-15 09:06:00 +01:00
daniel	cec81f1cc2	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round ... Conflicts: pandora_console/extras/mr/62.sql	2023-03-14 18:17:54 +01:00
Jonathan	f9fe35e0c3	log viewer and sort reporting	2023-03-14 17:28:17 +01:00
Daniel Cebrian	d315d4cda7	#10633 added token for control check conexion interval	2023-03-14 13:16:58 +01:00
Daniel Maya	62d1249fe0	#8642 Added heatmap widget 4	2023-03-14 12:47:10 +01:00
Daniel Cebrian	e36bb1d065	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-14 08:36:12 +01:00
daniel	d092495482	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-13 19:31:26 +01:00
daniel	c96ac79726	fixed styles	2023-03-13 19:30:51 +01:00
Diego Muñoz-Reja	fa2918e8ed	Merge branch 'ent-10229-AXITY-Update-jquery-para-solventar-vulnerabilidades' into 'develop' ... updated jquery-ui library See merge request artica/pandorafms!5564	2023-03-13 16:03:04 +00:00
Daniel Cebrian	dfa2ab818e	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-13 08:53:35 +01:00
daniel	dcfaaea016	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-10 14:50:31 +01:00
Jose Gonzalez	a065833117	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-10 12:48:50 +01:00
Jose Gonzalez	dc216ff788	Tree view black	2023-03-10 12:47:44 +01:00
daniel	3be507ca7e	fixed styles	2023-03-10 12:40:21 +01:00
Daniel Cebrian	841478a86c	Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' ... # Conflicts: # pandora_console/pandoradb.sql	2023-03-10 10:41:08 +00:00
Pablo Aragon	ae6159c7a1	Events	2023-03-10 08:40:38 +01:00
daniel	9aa5d76963	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-09 20:00:32 +01:00
daniel	63d83b3f97	fixed styles	2023-03-09 11:25:43 +01:00
Rafael Ameijeiras	857c84f034	Merge branch 'ent-10359-GUARDIA-15007-No-se-visualizan-agentes-deshabilitados-en-operaciones-masivas-en-meta-sin-usar-opcion-Show-agents' into 'develop' ... fixed error in massive agent operations in metaconsole See merge request artica/pandorafms!5527	2023-03-09 08:08:58 +00:00
Daniel Cebrian	6efa1f46d7	#10324 fixed conflic wit tickets 10325	2023-03-08 16:01:50 +01:00
Jonathan	91a708dfb8	SNMP Browser and agent module SNMP walk	2023-03-08 13:41:00 +01:00
Daniel Cebrian	11250bd59b	Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida	2023-03-08 13:00:18 +01:00
Daniel Cebrian	3ec11f4c9d	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-08 12:55:53 +01:00
Daniel Cebrian	27005158ba	#9073 resolve conflics and bugs	2023-03-07 17:57:09 +01:00
daniel	1ba420a9ce	fixed styles	2023-03-07 16:22:13 +01:00
Pablo Aragon	3ecbf1e4fa	Alerts	2023-03-07 16:17:01 +01:00
Daniel Cebrian	a4634717d8	Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida	2023-03-07 13:49:39 +01:00
Jose Gonzalez	d0f2f7a9c1	TreeController fixed	2023-03-07 09:48:23 +01:00
daniel	dba1554d74	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/general/login_page.php	2023-03-07 08:04:45 +01:00
Jose Gonzalez	5ecc3470e2	Tree View in dashboard minor fixes	2023-03-06 23:48:06 +01:00
alejandro.campos@artica.es	5cbd9114d9	fixed load of agents	2023-03-06 18:18:26 +01:00
Jose Gonzalez	e33a9bc3e4	Services TreeView	2023-03-06 13:32:21 +01:00
Jose Gonzalez	6a35eb9950	Network map minor fixes	2023-03-06 11:12:59 +01:00
Rafael Ameijeiras	03a7d9e89a	Merge branch 'ent-10230-AXITY-Vulnerabilidades-underscore-js' into 'develop' ... updated underscore See merge request artica/pandorafms!5570	2023-03-06 07:59:58 +00:00
Pablo Aragon	6ae86b4c39	Sound events. Login SAML	2023-03-06 08:21:04 +01:00
daniel	f6e063b981	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/include/class/SnmpConsole.class.php	2023-03-06 08:09:29 +01:00
Jimmy Olano	6b55c65330	Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS. ... Ent 10092 14739 peticion de filtro en widget tree view See merge request artica/pandorafms!5532	2023-03-05 22:56:35 +00:00
daniel	ff3b7001c3	fixed styles	2023-03-04 13:22:52 +01:00
daniel	95df525cb2	fixed styles	2023-03-03 14:16:06 +01:00
Pablo Aragon	b18a689225	About meta and observer input password	2023-03-03 12:40:58 +01:00
daniel	6545bdbaf1	fixed styles	2023-03-02 14:25:52 +01:00
Jonathan	d5cd9a0ab2	SNMP browser action buttons	2023-02-28 15:26:42 +01:00
Jose Gonzalez	114e9a366f	Networkmap	2023-02-28 10:39:31 +01:00
Jose Gonzalez	ce5ccbec5d	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-28 09:36:21 +01:00
daniel	76b2c8743b	Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/include/functions_ui.php pandora_console/include/styles/pandora.css	2023-02-27 18:25:45 +01:00
alejandro.campos@artica.es	930879b295	updated underscore	2023-02-27 17:26:58 +01:00
Jose Gonzalez	5df442e83e	Network maps improve	2023-02-27 16:37:00 +01:00
Daniel Cebrian	8a33756e3a	#10324 added limit in modal title	2023-02-27 11:17:17 +01:00
Daniel Cebrian	4917b40d10	10324 fixed modal in filter title	2023-02-27 10:05:16 +01:00
Daniel Cebrian	e76d8606dc	#10324 added star in menu	2023-02-27 09:45:15 +01:00
Daniel Cebrian	032fcdeae4	#10324 added fav menu in reporting viewer	2023-02-24 10:23:14 +01:00
Jose Gonzalez	6a5c2c58c7	Fix tree view	2023-02-24 10:19:56 +01:00
Jonathan	a09c423284	SNMP views fix	2023-02-23 17:09:58 +01:00
alejandro.campos@artica.es	ed93f55048	updated jquery-ui library	2023-02-23 16:48:57 +01:00
Jose Gonzalez	f08fc6a8b7	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-23 14:31:59 +01:00
Jose Gonzalez	d7c70bd8a8	Tree view fixes	2023-02-23 14:30:31 +01:00
Jonathan	0fbf50673a	Dashboard multiselect height + delete size modal	2023-02-23 10:11:35 +01:00
Daniel Cebrian	0990fe672e	#10324 added system fav menu in agent and events	2023-02-23 09:48:13 +01:00
daniel	8230ae616b	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/godmode/users/user_list.php pandora_console/operation/events/events.php	2023-02-22 12:35:34 +01:00
Pablo Aragon	e7d6afd636	10488-Fix views reports	2023-02-22 10:35:33 +01:00
Pablo Aragon	95fb797a7e	10488-Fix views reports	2023-02-22 10:33:45 +01:00
Jonathan	05c2232daa	Modals dashboard view fix	2023-02-21 17:07:03 +01:00
Pablo Aragon	57a6bf97b0	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-21 11:28:36 +01:00
Pablo Aragon	7ac794f5ff	10469-Fix omnishell view	2023-02-21 11:28:26 +01:00
Jonathan	005fbd27c1	Tree view meta fix	2023-02-21 11:20:17 +01:00
Jose Gonzalez	98bd383141	Minor html and ui improvements	2023-02-20 11:49:54 +01:00
Daniel Cebrian	ace67ba42d	#9073 fixed bug when modal close	2023-02-17 14:22:41 +01:00
Daniel Cebrian	35a1a67006	#9073 refactoring	2023-02-17 12:53:35 +01:00
Daniel Cebrian	9a0dc247c0	#9073 added preview tip	2023-02-17 11:07:28 +01:00
Daniel Cebrian	0cee40e40a	#9073 create button for preview tip	2023-02-16 18:13:34 +01:00
Daniel Cebrian	dce5b07109	#9073 added control image and fixed bug with language filter	2023-02-16 16:14:50 +01:00
Jonathan	f557309238	Button ok mesage too much agents	2023-02-16 09:09:40 +01:00
Daniel Cebrian	d8cfc68585	#9073 order by language tips	2023-02-15 17:51:30 +01:00
Daniel Cebrian	8ea9a0fc7e	#9073 added system system for edit images in edit tip	2023-02-15 16:41:14 +01:00
Daniel Cebrian	09d703f981	#9073 added images input in create tips	2023-02-15 11:58:34 +01:00
Daniel Maya	cac9f67153	#10195 Fixed minimap drawing	2023-02-15 10:49:31 +01:00
Daniel Cebrian	5d6ac202df	#9073 clear logs	2023-02-14 10:55:48 +01:00
Daniel Cebrian	ad4750c409	#9073 fixed bug in firts tips	2023-02-14 10:55:01 +01:00
Daniel Cebrian	dfb93d2cf5	#9073 added token for tips in user profile configuration	2023-02-14 10:34:08 +01:00
Daniel Cebrian	887d2f8f18	#9073 added counter round un footer	2023-02-13 16:21:37 +01:00
Pablo Aragon	feb2f3ffa2	10092-Widget tree view, Not normal status	2023-02-13 15:03:23 +01:00
Daniel Cebrian	6619cf059d	#9073 added design v1	2023-02-13 13:26:49 +01:00
Daniel Cebrian	e62dee1c62	#9073 create files structure	2023-02-13 10:06:14 +01:00
Jose Gonzalez	d6eedf07aa	Merge	2023-02-13 10:03:09 +01:00
Rafael Ameijeiras	616644c3cf	Merge branch 'ent-10189-mejora-visual-para-el-boton-de-testeo-de-alertas-consola-sonora' into 'develop' ... blink button test sound events pandora_enterprise#10189 See merge request artica/pandorafms!5470	2023-02-10 08:01:34 +00:00