27003 Commits

Author	SHA1	Message	Date
artica	bcf3f1ba1f	Auto-updated build strings.	2023-03-25 01:00:19 +01:00
Daniel Maya	e311c81f84	#8642 Fixed meta	2023-03-24 14:11:08 +01:00
daniel	abf9fcf200	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-24 14:05:30 +01:00
daniel	25ea15fe0f	fixed styles	2023-03-24 14:04:38 +01:00
Matias Didier	f931a86f22	Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop' ... Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all See merge request artica/pandorafms!5624	2023-03-24 12:15:01 +00:00
Daniel Cebrian	60f237b66e	#10441 added version file in pandora flot	2023-03-24 12:53:48 +01:00
Daniel Cebrian	e463024eb6	#10441 added version file in css in events	2023-03-24 12:34:53 +01:00
Pablo Aragon	be1fb9298b	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-24 12:29:09 +01:00
Pablo Aragon	95edb47d01	10408	2023-03-24 12:29:03 +01:00
Daniel Cebrian	075d0a1c4f	#10441 added version file in css	2023-03-24 12:06:40 +01:00
Jimmy Olano	eb833f2ad8	Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS. ... Ent 10747 version open error 500 en vista principal de un agente See merge request artica/pandorafms!5616	2023-03-24 10:14:01 +00:00
Calvo	c4ef22164b	Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow	2023-03-24 10:38:44 +01:00
Matias Didier	5529c33f0c	Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop' ... Ent 10650 bugs funcionales en consolas visuales See merge request artica/pandorafms!5601	2023-03-24 09:11:26 +00:00
Rafael Ameijeiras	f14be9c523	Merge branch 'ent-10311-14988-comentarios-de-eventos-se-muestran-en-evento-no-relacionado' into 'develop' ... Ent 10311 14988 comentarios de eventos se muestran en evento no relacionado See merge request artica/pandorafms!5582	2023-03-24 09:03:37 +00:00
Daniel Cebrian	da742bc15e	#10441 added version file in js	2023-03-24 09:13:22 +01:00
Rafael Ameijeiras	a30ba4cf27	Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' ... Ent 9624 meter soporte a sflow en nuestro gestor de flujos See merge request artica/pandorafms!5587	2023-03-24 07:25:52 +00:00
artica	8a14ec6725	Auto-updated build strings.	2023-03-24 01:00:23 +01:00
daniel	96d03ca31c	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-23 17:47:58 +01:00
Pablo Aragon	0fa79e44f1	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-23 17:44:16 +01:00
daniel	bac1a7bf65	fixed styles	2023-03-23 17:44:06 +01:00
Pablo Aragon	122f45fcaa	Metasetup	2023-03-23 17:44:04 +01:00
Daniel Cebrian	31fd4a616c	#10793 fixed pagination filter	2023-03-23 16:36:06 +01:00
Daniel Cebrian	d3408442d3	#10793 fixed collation in sql	2023-03-23 16:25:08 +01:00
Daniel Cebrian	044bd0e54d	#10793 changed collation tables tips	2023-03-23 15:57:32 +01:00
Daniel Cebrian	69b573e266	#10441 added version in import files js and css	2023-03-23 14:43:13 +01:00
daniel	56e4770b93	fixed styles	2023-03-23 14:20:54 +01:00
Rafael Ameijeiras	766664470d	Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop' ... Ent 9893 nuevo sistema de ha See merge request artica/pandorafms!5563	2023-03-23 12:58:53 +00:00
Daniel Rodriguez	b09d65dd91	Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop' ... Ent 10010 mejorar filtrado logs en informe de logs See merge request artica/pandorafms!5602	2023-03-23 11:46:49 +00:00
daniel	95834b2de7	fixed styles	2023-03-23 12:41:39 +01:00
Daniel Cebrian	2683f9e6dc	#10792 fixed error 500 in agent status list	2023-03-23 12:39:55 +01:00
Daniel Maya	52231615f6	Merge branch 'develop' into ent-8642-nuevo-widget-heatmap	2023-03-23 11:51:54 +01:00
Pablo Aragon	1ac37dd538	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-23 11:51:32 +01:00
Pablo Aragon	f32c886167	10712-login	2023-03-23 11:51:21 +01:00
Daniel Maya	94c843dac2	#9662 Fixed gis map menu	2023-03-23 10:41:08 +01:00
Daniel Cebrian	a60f9be920	#9624 changed default binary path daemon for sflow	2023-03-23 09:53:34 +01:00
Pablo Aragon	e2820d1ad7	9680-Fix widget	2023-03-23 09:18:39 +01:00
daniel	0959f1a537	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-23 07:44:17 +01:00
artica	cbbddd1ac6	Auto-updated build strings.	2023-03-23 01:00:18 +01:00
Pablo Aragon	1316968295	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-22 20:00:48 +01:00
Pablo Aragon	bd48dba65f	10715-Fix width tree view graph	2023-03-22 20:00:42 +01:00
daniel	72c95a6274	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-22 19:12:16 +01:00
Pablo Aragon	d6bf16f536	10712-Login	2023-03-22 18:57:36 +01:00
Rafael Ameijeiras	4535fb85a3	Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop' ... fixes in event comments See merge request artica/pandorafms!5591	2023-03-22 17:05:54 +00:00
Pablo Aragon	8b163cd100	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-22 16:42:15 +01:00
Pablo Aragon	b0b2778c4a	10760-Setup	2023-03-22 16:42:03 +01:00
Calvo	96017090ce	Netflow monitoring filters forms	2023-03-22 14:22:17 +01:00
Jonathan	c52ca613b2	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-22 14:22:08 +01:00
Jonathan	a063c7a0ac	Fix header and menu	2023-03-22 14:21:56 +01:00
daniel	e82de5d6aa	fixed styles	2023-03-22 14:08:03 +01:00
Calvo	784bd2dbcf	Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow	2023-03-22 12:31:11 +01:00
Rafael Ameijeiras	3fcf4dfbc5	Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop' ... Ent 10737 15246 error 500 en mapa servicios metaconsola See merge request artica/pandorafms!5617	2023-03-22 10:34:42 +00:00
Pablo Aragon	41a20a90fa	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-22 11:23:14 +01:00
Pablo Aragon	904b526b30	Change pass login. Graph tree view width	2023-03-22 11:23:07 +01:00
daniel	5eaa4a10bb	fixed styles	2023-03-22 11:13:56 +01:00
Rafael Ameijeiras	87421e772d	Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' ... # Conflicts: # pandora_console/install.php	2023-03-22 08:23:07 +00:00
artica	6e8eb9800f	Auto-updated build strings.	2023-03-22 01:00:23 +01:00
daniel	64e5ceaea0	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-21 18:43:39 +01:00
daniel	732000f7bd	fixed styles	2023-03-21 18:42:31 +01:00
Pablo Aragon	583ec8209c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-21 18:12:11 +01:00
Pablo Aragon	99b845db3f	progress bar	2023-03-21 18:12:02 +01:00
Jonathan	e2615b9593	Visual changes header	2023-03-21 17:02:03 +01:00
Daniel Cebrian	fe70d7d44b	#10650 added image maintenance mode	2023-03-21 16:26:05 +01:00
Daniel Cebrian	a21e43a452	#10764 ignore selected action in fav menu	2023-03-21 15:40:46 +01:00
Jonathan	93f5b62bd2	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-21 14:23:15 +01:00
Jonathan	a960644975	Omnishell fix view	2023-03-21 14:23:12 +01:00
daniel	64fc4bcd46	fixed styles	2023-03-21 14:06:28 +01:00
Pablo Aragon	1f7183c701	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-21 13:31:18 +01:00
Pablo Aragon	e8744b5d12	10712-New login	2023-03-21 13:31:11 +01:00
Jonathan	d2d8b43c87	Custom fields agent view change size svg	2023-03-21 13:09:32 +01:00
Daniel Cebrian	aec5e6b483	#10737 fixed error 500 in service map	2023-03-21 12:52:24 +01:00
Jonathan	9654ba4fa2	Snmp browser select multiple post	2023-03-21 12:35:25 +01:00
Calvo	834be58631	Fix erorrs	2023-03-21 12:28:46 +01:00
Calvo	cd2f8021f5	Updated MR netflow server	2023-03-21 12:12:54 +01:00
Calvo	1686a758b9	Updated MR netflow server	2023-03-21 12:11:07 +01:00
Jonathan	af00950dc5	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-21 12:07:25 +01:00
Jonathan	72778eb97c	Wizzard template fix	2023-03-21 12:07:10 +01:00
Daniel Cebrian	8e88e0a603	#10747 fixed error 500 in agent	2023-03-21 11:45:38 +01:00
Calvo	803e23fbac	Updated MR netflow server	2023-03-21 11:28:11 +01:00
Calvo	a69151a3ca	Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow	2023-03-21 11:23:02 +01:00
Daniel Cebrian	388c6c3a2f	fixed color in counter refresh in node	2023-03-21 11:07:44 +01:00
Daniel Cebrian	2db4ec6a2b	fixed color in counter refresh	2023-03-21 10:53:23 +01:00
Daniel Cebrian	563e9e15c4	#9624 fixed conflics	2023-03-21 10:30:35 +01:00
Rafael Ameijeiras	361ecf4019	Merge branch 'ent-10411-15079-error-event-replication-en-vista-de-comentarios' into 'develop' ... Fix events comment tags acl See merge request artica/pandorafms!5544	2023-03-21 09:00:45 +00:00
Daniel Cebrian	ed7b46eb22	#9662 fixed url tactic in list groups	2023-03-21 09:56:36 +01:00
Jonathan	82dd6ebb37	Metaconsole view reports change	2023-03-21 09:52:21 +01:00
Daniel Cebrian	9dea38f440	Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos	2023-03-21 09:38:56 +01:00
artica	01e152a6e3	Auto-updated build strings.	2023-03-21 08:01:57 +01:00
artica	dc86557f19	Auto-updated build strings.	2023-03-21 08:01:57 +01:00
artica	fff8b78cb4	Auto-updated build strings.	2023-03-21 08:01:57 +01:00
artica	b9e546cbd6	Auto-updated build strings.	2023-03-21 08:01:57 +01:00
artica	f896eceb47	Auto-updated build strings.	2023-03-21 01:00:19 +01:00
artica	37940a2565	Auto-updated build strings.	2023-03-20 01:00:08 +01:00
artica	e64d9e2b7b	Auto-updated build strings.	2023-03-19 01:00:12 +01:00
artica	426f756d16	Auto-updated build strings.	2023-03-18 01:00:23 +01:00
Jonathan	a1144ce7ab	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-17 13:35:46 +01:00
Jonathan	de538a10cb	setup Performance visual changes	2023-03-17 13:35:43 +01:00
daniel	594d34931c	fixed styles	2023-03-17 13:20:58 +01:00
Daniel Cebrian	b81b7ce7af	#fixed in fav menu when change name the original name	2023-03-17 12:25:43 +01:00
Jonathan	fd5347e893	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-17 12:15:13 +01:00
Jonathan	dfbdfbaf60	Create module message error correction	2023-03-17 12:15:10 +01:00
daniel	a9633085bc	fixed styles	2023-03-17 12:00:51 +01:00
Pablo Aragon	b922b50688	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-17 11:34:00 +01:00
Pablo Aragon	6b140445c3	10712-New login	2023-03-17 11:33:50 +01:00
Calvo	284e20fc8a	Unified default netflow interval and deleted from console setup	2023-03-17 10:58:58 +01:00
daniel	f83acb99f0	fixed create user and add profile	2023-03-17 10:09:11 +01:00
Daniel Cebrian	bb794d603b	fixed button create tips and icon remove	2023-03-17 09:13:00 +01:00
Jose Gonzalez	0bbf8d0344	New dot icon	2023-03-17 08:58:25 +01:00
Jonathan	c219ad91c7	Visual minor fix	2023-03-17 08:53:58 +01:00
Calvo	13f52c18bc	Merge remote-tracking branch 'origin/develop' into ent-10411-15079-error-event-replication-en-vista-de-comentarios	2023-03-17 08:44:59 +01:00
daniel	8e723685b1	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-17 08:11:08 +01:00
daniel	0934b75cbd	fixed styles	2023-03-17 08:10:19 +01:00
artica	6b14fc0205	Auto-updated build strings.	2023-03-17 01:00:38 +01:00
daniel	3f09fd16a7	fixed styles	2023-03-16 18:51:54 +01:00
Jose Gonzalez	211f29c0f9	Websocket engine and quickshell	2023-03-16 17:49:57 +01:00
Jose Gonzalez	bbb1855d81	External Tools	2023-03-16 17:38:51 +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
Jose Gonzalez	1500edc06e	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 16:33:22 +01:00
Jose Gonzalez	6d37781255	Minor fixes visual styles	2023-03-16 16:33:08 +01:00
daniel	5921e61ad8	fixed styles	2023-03-16 16:32:18 +01:00
Jonathan	921e949947	cluster visual fix link	2023-03-16 16:06:03 +01:00
Jonathan	d006c93297	Create update module msg error on open	2023-03-16 15:38:08 +01:00
Jonathan	758d04333d	clusterview margin title on view	2023-03-16 14:10:48 +01:00
Jonathan	7704e4a1da	clusterview margin title on view	2023-03-16 14:07:12 +01:00
Jonathan	ad5078fcc0	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 13:31:22 +01:00
Jonathan	f417772642	TipsWindow blacktheme	2023-03-16 13:31:16 +01:00
Jose Gonzalez	9508d2d572	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 13:11:22 +01:00
Jose Gonzalez	8d7620e88d	Setup updates	2023-03-16 13:11:11 +01:00
Pablo Aragon	de93dd1c6e	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 12:57:59 +01:00
Pablo Aragon	260caca63a	10021, 10224, 10652, 10414	2023-03-16 12:57:48 +01:00
Jose Gonzalez	3782fdaaf6	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 12:50:39 +01:00
Jose Gonzalez	7bd8f0cc0d	Minor visual fix	2023-03-16 12:50:31 +01:00
Jonathan	b56cb0e78e	log sources view hide on empty	2023-03-16 12:23:58 +01:00
Jonathan	fa06b4e8a3	datepicker fix logviewer	2023-03-16 12:22:14 +01:00
Daniel Maya	1eae8a5a4d	#9893 fixed images	2023-03-16 12:04:18 +01:00
Jonathan	45a055573a	Log viewer datepicker fixed	2023-03-16 11:59:38 +01:00
Jose Gonzalez	fd82e1a582	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 11:58:40 +01:00
Jose Gonzalez	21c263c7c4	Setup views	2023-03-16 11:58:35 +01:00
Jonathan	02ef024905	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 10:42:46 +01:00
Jonathan	3aba51d0ed	Borders and colors PDFS	2023-03-16 10:42:39 +01:00
Daniel Maya	1d4aeef893	Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha	2023-03-16 10:10:16 +01:00
Jose Gonzalez	e474ec0915	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-16 09:43:38 +01:00
Jose Gonzalez	9ac04fba28	Netflow fix	2023-03-16 09:42:59 +01:00
artica	2767d24f60	Auto-updated build strings.	2023-03-16 01:00:18 +01:00
daniel	39f342a982	fixed styles	2023-03-15 21:17:50 +01:00
Jose Gonzalez	2cf13b00a1	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 17:43:47 +01:00
Jose Gonzalez	d2a807636e	General Setup view	2023-03-15 17:43:35 +01:00
Pablo Aragon	043db37c57	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 17:02:34 +01:00
Pablo Aragon	4d6029ba3f	10408-Manage agents, Agent view	2023-03-15 17:02:25 +01:00
Jose Gonzalez	e9526bf886	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 16:37:33 +01:00
Jonathan	9a21c40780	Background white PDFS	2023-03-15 16:35:49 +01:00
Jose Gonzalez	84fe5695d8	Visual styles Setup view	2023-03-15 16:34:18 +01:00
Jonathan	ac3816709c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 16:06:47 +01:00
Jonathan	30538265e8	Cluster wizzard visual fix	2023-03-15 16:06:42 +01:00
Pablo Aragon	797f43ff3c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 15:58:34 +01:00
Pablo Aragon	bed1e34fd2	Dashboards widgets	2023-03-15 15:58:28 +01:00
Jonathan	19b295060b	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 13:53:34 +01:00
Jonathan	17ba51d2bf	cluster view	2023-03-15 13:53:23 +01:00
Daniel Cebrian	c346aefeaa	#10685 changed in system fav, tips and Tactical group view	2023-03-15 12:46:09 +01:00
Daniel Maya	4b3bf70eb5	#10451 Fixed phardata	2023-03-15 12:04:28 +01:00
Pablo Aragon	00a5e8e84b	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 11:30:40 +01:00
Pablo Aragon	938e8cd777	Dashboards widgets	2023-03-15 11:30:22 +01:00
Jose Gonzalez	12f8b6dbba	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-15 11:15:09 +01:00
Jose Gonzalez	6ac41ed907	Icon added	2023-03-15 11:15:04 +01:00
Jonathan	8a7b60e983	PDF changes visual	2023-03-15 09:58:56 +01:00
Calvo	ebc36625d5	FIX MR	2023-03-15 09:24:53 +01:00
Jonathan	d323ab7fe5	Timezonevisual correction and fix conflict	2023-03-15 09:06:07 +01:00
Daniel Cebrian	1b0477bd1f	Merge branch 'develop' into ent-10633-pantalla-de-timeout	2023-03-15 09:06:00 +01:00
Daniel Cebrian	e0c5921d59	#10633 fixed size icon connection_check	2023-03-15 09:01:49 +01:00
Jose Gonzalez	bab3248d57	Monitor view with not normal at start	2023-03-15 08:56:15 +01:00
artica	b082910ca6	Auto-updated build strings.	2023-03-15 01:00:57 +01:00
Calvo	1be124059e	FIX MR	2023-03-14 19:48:49 +01:00
Calvo	4adaf31a5a	Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow	2023-03-14 19:45:48 +01:00
Calvo	6950624cc9	Added new netflow server filters form	2023-03-14 18:55:43 +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
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
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
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	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
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
Jonathan	fcdd585042	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 17:36:11 +01:00
Jonathan	4f2ab51252	UI Reporting PDF Changes	2023-03-13 17:36:04 +01:00
Jose Gonzalez	fe20b4c49c	Plugins view	2023-03-13 17:32:20 +01:00
Jose Gonzalez	b6251edb79	Minor fix	2023-03-13 17:31:43 +01:00
Daniel Cebrian	90f0c3771f	#10324 fixed deleted element fav menu	2023-03-13 17:21:28 +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	64cc261483	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-13 16:48:47 +01:00
Jose Gonzalez	3ebfee9ccb	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 16:21:35 +01:00
Jose Gonzalez	c2ba5cfdd3	Agent status	2023-03-13 16:21:14 +01:00
Pablo Aragon	51ab985784	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 16:14:02 +01:00
Pablo Aragon	6450100f23	Manage agent, setup view	2023-03-13 16:13:49 +01:00
Jose Gonzalez	a7cfa310a3	Agents alias in header	2023-03-13 15:52:28 +01:00
Jose Gonzalez	1c85038ffa	Discovery progress bars	2023-03-13 15:44:55 +01:00
Daniel Maya	0e4d423825	Merge branch 'develop' into ent-8642-nuevo-widget-heatmap	2023-03-13 15:17:18 +01:00
Daniel Maya	b446e89728	Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha	2023-03-13 15:08:44 +01:00
Daniel Maya	695f3fb282	#9893 Added img disabled	2023-03-13 15:07:38 +01:00
Jose Gonzalez	3ae465c1fe	Fix header help icons	2023-03-13 14:33:42 +01:00
Jose Gonzalez	0624f16ce9	Minor fix	2023-03-13 14:23:54 +01:00
Jonathan	a0bffb79bd	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 14:21:17 +01:00
Jonathan	10c0d95f34	Reports PDFS changes	2023-03-13 14:21:10 +01:00
Jose Gonzalez	1b4136d91e	Minor fix	2023-03-13 14:10:20 +01:00
Jose Gonzalez	45ba4cdd15	Netflow	2023-03-13 14:03:00 +01:00
Jose Gonzalez	7bedd86e25	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 13:26:03 +01:00
Jose Gonzalez	5466cb5995	Netflow live view	2023-03-13 13:25:42 +01:00
Daniel Cebrian	bdeb2240f3	10324 refactor duplicity code	2023-03-13 13:01:48 +01:00
Calvo	8bdc528dc4	Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole	2023-03-13 12:58:14 +01:00
Daniel Cebrian	339d7e8bfe	#10324 fixed error 500	2023-03-13 12:57:09 +01:00
daniel	0643b4e0ba	fixed styles	2023-03-13 12:19:27 +01:00
Pablo Aragon	0203e5eba9	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-13 12:03:43 +01:00
Pablo Aragon	2cd09d7618	Datatable message info	2023-03-13 12:03:33 +01:00