5147 Commits

Author	SHA1	Message	Date
Jose Gonzalez	d449179765	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-11 02:10:23 +01:00
Jose Gonzalez	39ace10629	Fix image issue with Networkmap	2023-03-11 02:08:37 +01:00
Daniel Cebrian	ca78f069f6	#9624 added support sflow	2023-03-10 17:12:38 +01:00
Calvo	e2297171cb	Process inventory modules with correct xml and empty data	2023-03-10 15:14:43 +01:00
daniel	dcfaaea016	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-10 14:50:31 +01:00
daniel	8778fcea93	fixed styles	2023-03-10 14:49:38 +01:00
Pablo Aragon	427ecf96e4	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-10 13:03:35 +01:00
Pablo Aragon	ceed3c5d51	Alert details validation	2023-03-10 13:02:23 +01:00
daniel	3be507ca7e	fixed styles	2023-03-10 12:40:21 +01:00
Daniel Maya	030a37a5da	Merge branch 'develop' into ent-8642-nuevo-widget-heatmap	2023-03-10 12:19:00 +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
Jose Gonzalez	edbc9d8f6b	Icons review	2023-03-09 23:31:40 +01:00
daniel	6d0b0039c5	fixed styles	2023-03-09 19:25:14 +01:00
Jose Gonzalez	ac1db7820c	Minor fixes	2023-03-09 17:41:29 +01:00
Jose Gonzalez	d8cdb13b59	Fix minor issue	2023-03-09 11:43:36 +01:00
daniel	63d83b3f97	fixed styles	2023-03-09 11:25:43 +01:00
Jose Gonzalez	c855061d43	Netflow view	2023-03-09 00:45:41 +01:00
Jonathan	63ecb7eb0b	Tree view metaconsole view like nodo	2023-03-08 15:45:18 +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
Jose Gonzalez	5017878701	Messages view	2023-03-07 22:05:06 +01:00
Jose Gonzalez	4af67db415	Export data view	2023-03-07 18:10:07 +01:00
Daniel Cebrian	27005158ba	#9073 resolve conflics and bugs	2023-03-07 17:57:09 +01:00
Jose Gonzalez	14246ea570	User edit notifications	2023-03-07 17:50:03 +01:00
Jose Gonzalez	2dbc2e801f	Minor icon fixes	2023-03-07 17:24:36 +01:00
Jose Gonzalez	f7aab35082	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 15:59:51 +01:00
Jose Gonzalez	226b80b7c7	Icon revision	2023-03-07 15:59:10 +01:00
Daniel Maya	6b9175ea0d	Merge branch 'develop' into ent-9662-second-round	2023-03-07 15:05:28 +01:00
Jonathan	8dbcffaa8b	Buttons and view report	2023-03-07 14:15:02 +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
Daniel Cebrian	fdc73be979	Merge branch 'develop' into ent-10347-vista-tactica-de-grupo	2023-03-07 13:19:52 +01:00
daniel	1db803b8f6	fixed styles	2023-03-07 12:59:34 +01:00
Jose Gonzalez	44fb762fdf	Minor fixes with graphs	2023-03-06 15:44:32 +01:00
Jonathan	2a11873638	#9529 fix events last contact value	2023-03-06 12:12:36 +01:00
Jonathan	cf29caedcd	Conflict solution	2023-03-06 11:04:05 +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	08dca1a83c	fixed styles	2023-03-05 13:46:27 +01:00
daniel	ff3b7001c3	fixed styles	2023-03-04 13:22:52 +01:00
Jose Gonzalez	9ad97ee267	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-03 14:51:07 +01:00
Jose Gonzalez	6846961ff0	Icon updates	2023-03-03 14:50:47 +01:00
daniel	95df525cb2	fixed styles	2023-03-03 14:16:06 +01:00
Jose Gonzalez	df6dddb586	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-03 13:52:49 +01:00
Jose Gonzalez	128dc9c42c	Visual console changes	2023-03-03 13:52:28 +01:00
Daniel Cebrian	00b5d3f237	#1347 added links tactical view group	2023-03-03 13:24:33 +01:00
Pablo Aragon	f3b9d73855	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-03 12:43:35 +01:00
Pablo Aragon	b18a689225	About meta and observer input password	2023-03-03 12:40:58 +01:00
Jonathan	e5cbe07a86	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-03 10:12:28 +01:00
Jonathan	8d31603e44	Custom Graphs visual changes	2023-03-03 10:12:24 +01:00