33601 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
daniel	4883debc02	Merge branch 'ent-9662-second-round' into 'develop' ... Ent 9662 second round See merge request artica/pandorafms!5598	2023-03-14 17:20:22 +00: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
Jose Gonzalez	49b5b8b253	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 18:15:35 +01:00
Jose Gonzalez	4f5d3ed924	Netflow meta	2023-03-14 18:15:31 +01:00
Jonathan	c2b8554713	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 17:28:24 +01:00
Jonathan	f9fe35e0c3	log viewer and sort reporting	2023-03-14 17:28:17 +01:00
daniel	423767a32a	fixed styles	2023-03-14 17:27:01 +01:00
daniel	c4f4d371cc	fixed styles	2023-03-14 17:25:58 +01:00
Daniel Cebrian	26c08ebe0f	#10650 fixed bug when user access in view maintenance and show modules select	2023-03-14 17:13:19 +01:00
Daniel Maya	feff8668be	#8642 added img	2023-03-14 16:49:12 +01:00
Alejandro Sánchez	8278c9c4e5	Merge branch 'ent-10178-14839-plugin-autodiscover-de-agente-perjudica-al-agente' into 'develop' ... changed the way of getting data out of windows to make it faster See merge request artica/pandorafms!5590	2023-03-14 15:44:28 +00:00
Daniel Maya	4220ac6e4f	#10010 Added full text	2023-03-14 16:27:22 +01:00
Pablo Aragon	302e3c8bf7	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 15:59:27 +01:00
Pablo Aragon	620bff28af	Dashboards widgets	2023-03-14 15:59:20 +01:00
Jonathan	2424e5009c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 15:42:02 +01:00
Jonathan	dac980e55e	PDFs visual changes	2023-03-14 15:41:55 +01:00
Pablo Aragon	6e4fe7bc48	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 14:56:52 +01:00
Pablo Aragon	658f2853f7	Dashboards widgets	2023-03-14 14:56:33 +01:00
Jose Gonzalez	2955df3b9c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 13:47:21 +01:00
Jose Gonzalez	bd9ec31c2b	User list and other fixes	2023-03-14 13:46:49 +01:00
Jonathan	9f953809a0	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 13:26:31 +01:00
Jonathan	00ba02e23e	Visual changes PDFs slicebar	2023-03-14 13:26:21 +01:00
Daniel Cebrian	d315d4cda7	#10633 added token for control check conexion interval	2023-03-14 13:16:58 +01:00
Jose Gonzalez	b428e77e7c	User management for meta	2023-03-14 13:11:57 +01:00
Daniel Maya	a7a283fe22	#8642 Fixed heatmap widget	2023-03-14 12:52:44 +01:00
Daniel Maya	62d1249fe0	#8642 Added heatmap widget 4	2023-03-14 12:47:10 +01:00
Matias Didier	27beea7319	Merge branch 'ent-10324-sistema-de-favoritos' into 'develop' ... Ent 10324 sistema de favoritos See merge request artica/pandorafms!5559	2023-03-14 10:38:39 +00:00
Daniel Cebrian	be6c15fc58	#9624 change icon sflow	2023-03-14 10:46:50 +01:00
Daniel Cebrian	dff82df484	#10324 fixed deleted filter event in fav menu	2023-03-14 10:31:31 +01:00
Jose Gonzalez	93a912b76b	Fix MR	2023-03-14 10:01:09 +01:00
Daniel Cebrian	e4d6737192	#10324 fixed system fav in meta	2023-03-14 09:42:26 +01:00
Jose Gonzalez	3eced53695	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-14 09:06:08 +01:00
Jose Gonzalez	e71014607a	10669 fix revision	2023-03-14 09:05:59 +01:00
daniel	5028574e7d	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-14 08:54:01 +01:00
Daniel Cebrian	e36bb1d065	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-14 08:36:12 +01:00
Jose Gonzalez	397c4bd720	Fix plugin icon	2023-03-14 08:35:05 +01:00
Jose Gonzalez	3ab0b1c4cb	Minor fixes	2023-03-14 08:04:48 +01:00
Jose Gonzalez	f0a424a493	Module manager fix	2023-03-14 08:04:05 +01:00
artica	cf23817a7f	Auto-updated build strings.	2023-03-14 01:00:35 +01:00
Jose Gonzalez	ca39fa8560	#10669 Fix configure_user issue	2023-03-13 21:21:25 +01:00
Jose Gonzalez	79fbab3696	Tubercles removal	2023-03-13 21:17:55 +01:00
daniel	92ab4c3ca8	Merge branch 'ent-9662-second-round' into 'develop' ... Ent 9662 second round See merge request artica/pandorafms!5594	2023-03-13 18:33:26 +00: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
Ramon Novoa	ae0ccf93a4	Fix small spelling errors.	2023-03-13 18:17:46 +01:00
Daniel Cebrian	721d7eaff9	#10665 fixed error 500 in user edit view	2023-03-13 18:07:04 +01:00
Jose Gonzalez	154c97d653	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 17:50:45 +01:00
Jose Gonzalez	3b36545cec	New icon	2023-03-13 17:50:36 +01:00
Pablo Aragon	1d6e33f371	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 17:40:06 +01:00
Pablo Aragon	2215097100	Manage agent, modules	2023-03-13 17:39:58 +01:00