7389 Commits

Author	SHA1	Message	Date
alejandro.campos@artica.es	795ccb14e6	fixed metaconsole link	2023-04-04 13:57:53 +02:00
Jimmy Olano	89aa227b98	Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. ... Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual See merge request artica/pandorafms!5613	2023-04-04 11:57:45 +00:00
Jonathan	99b07a2fb2	Conflict solution	2023-04-04 11:35:26 +02:00
Jonathan	000ab68327	#10490 TinyMCE Upgrade V6	2023-04-04 11:24:49 +02:00
Pablo Aragon	e4c8097e9c	10402 remove passwords box & 10856 vcard	2023-04-04 09:24:29 +02:00
Matias Didier	e4b718a468	Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop' ... Ent 10839 problema con buscador agentes See merge request artica/pandorafms!5642	2023-04-03 06:58:55 +00:00
Jonathan	8d950c3672	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-31 13:37:59 +02:00
Jonathan	e8e7dcc5ec	Actions select bulk operations view	2023-03-31 13:37:43 +02:00
daniel	c315a7f8c5	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-31 13:31:39 +02:00
Pablo Aragon	2f619d1ef6	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-31 10:45:43 +02:00
Pablo Aragon	426690bc35	10843 & 10844	2023-03-31 10:44:51 +02:00
Daniel Rodriguez	ca16c5dd61	Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' ... Ent 10441 control de cache en actualizaciones See merge request artica/pandorafms!5623	2023-03-31 07:33:26 +00:00
daniel	d6a1155dbb	fixed styles	2023-03-31 08:45:54 +02:00
daniel	24e5fca884	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-30 17:34:06 +02:00
Pablo Aragon	3a2cbb7a62	Datatables & styles fix	2023-03-30 16:50:30 +02:00
Matias Didier	9344bd16c9	Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' ... Unified default netflow interval and deleted from console setup See merge request artica/pandorafms!5614	2023-03-30 12:39:06 +00:00
Daniel Maya	6bfdfa5a3b	10839 Fixed search	2023-03-30 14:09:02 +02:00
daniel	f2e1b2ef57	fixed styles	2023-03-30 12:36:05 +02:00
Pablo Aragon	e03e1e45ed	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-30 12:26:06 +02:00
Pablo Aragon	5e24706f71	Style fix	2023-03-30 12:25:45 +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
daniel	2c1301f542	fixed styles	2023-03-30 08:59:40 +02:00
daniel	1262fee2e8	fixed styles	2023-03-30 08:43:23 +02:00
alejandro.campos@artica.es	e8323e4b00	several minor fixes	2023-03-29 17:45:37 +02:00
daniel	8458716ba9	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-29 17:27:57 +02:00
Pablo Aragon	2b121a2fd2	New qrcode.js version & vcard	2023-03-29 15:34:03 +02:00
Matias Didier	4297481c35	Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop' ... Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas See merge request artica/pandorafms!5633	2023-03-29 12:32:44 +00:00
Daniel Maya	3af2637a7c	#10819 Fixed img	2023-03-29 13:37:07 +02:00
Diego Muñoz-Reja	35a1c2332d	Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' ... implemented consoles management See merge request artica/pandorafms!5558	2023-03-28 15:33:37 +00:00
Alejandro Campos	e909686ddc	Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' ... # Conflicts: # pandora_console/extras/mr/62.sql	2023-03-28 14:09:33 +00:00
Jonathan	53194f7c3d	Reports visual changes	2023-03-28 11:04:52 +02:00
Jonathan	87946161f3	Solution conflict	2023-03-28 09:30:18 +02:00
Jonathan	81be0da7fd	Module manager editor relations visual change	2023-03-28 09:17:47 +02:00
daniel	19ddbdc30a	fixed styles	2023-03-28 08:34:05 +02:00
daniel	ebffb004e9	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-27 21:22:06 +02:00
daniel	0461881420	fixed styles	2023-03-27 17:13:23 +02:00
Pablo Aragon	98f812b757	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-27 17:03:45 +02:00
Pablo Aragon	55ff0e0597	wux and wmi	2023-03-27 17:03:38 +02:00
daniel	48a254c4b2	fixed styles	2023-03-27 14:34:05 +02:00
Daniel Cebrian	fd9dfcf08f	Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' ... # Conflicts: # pandora_console/install.php	2023-03-27 11:01:24 +00:00
Daniel Cebrian	aeab39737b	Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500	2023-03-27 12:11:59 +02:00
daniel	3beec9bfab	fixed styles	2023-03-27 11:47:08 +02:00
Jonathan	665976e011	Bulks masive visual action buttons	2023-03-27 11:10:51 +02:00
Jonathan	f8aefa6e34	Merge conflict solution	2023-03-27 08:31:00 +02: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
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
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
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 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
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
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
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
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	e8744b5d12	10712-New login	2023-03-21 13:31: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	563e9e15c4	#9624 fixed conflics	2023-03-21 10:30:35 +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
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
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
Jonathan	c219ad91c7	Visual minor fix	2023-03-17 08:53:58 +01:00
daniel	0934b75cbd	fixed styles	2023-03-17 08:10:19 +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	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
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
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	21c263c7c4	Setup views	2023-03-16 11:58:35 +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	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
Jose Gonzalez	84fe5695d8	Visual styles Setup view	2023-03-15 16:34:18 +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
Daniel Cebrian	c346aefeaa	#10685 changed in system fav, tips and Tactical group view	2023-03-15 12:46:09 +01:00
Jonathan	8a7b60e983	PDF changes visual	2023-03-15 09:58:56 +01:00
Daniel Cebrian	1b0477bd1f	Merge branch 'develop' into ent-10633-pantalla-de-timeout	2023-03-15 09:06:00 +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 Maya	4220ac6e4f	#10010 Added full text	2023-03-14 16:27:22 +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	bd9ec31c2b	User list and other fixes	2023-03-14 13:46:49 +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 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	e71014607a	10669 fix revision	2023-03-14 09:05:59 +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
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 Cebrian	721d7eaff9	#10665 fixed error 500 in user edit view	2023-03-13 18:07: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
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
Jose Gonzalez	bbec6a92a4	Minor fixes	2023-03-13 09:35:12 +01:00
Daniel Cebrian	596ade6d37	#10324 added system fav in tactical view group	2023-03-13 09:14:16 +01:00
Daniel Cebrian	dfa2ab818e	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-13 08:53:35 +01:00
Daniel Cebrian	ca78f069f6	#9624 added support sflow	2023-03-10 17:12:38 +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
alejandro.campos@artica.es	39a119d150	Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob	2023-03-10 13:29:20 +01:00
Matias Didier	7d6452554f	Merge branch 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' into 'develop' ... fixed entities See merge request artica/pandorafms!5578	2023-03-10 11:54:46 +00: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	bb6bf85537	Minor visual fixes	2023-03-10 12:48:31 +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	92e5c4efa0	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-10 08:40:48 +01:00
Pablo Aragon	ae6159c7a1	Events	2023-03-10 08:40:38 +01:00
Jose Gonzalez	edbc9d8f6b	Icons review	2023-03-09 23:31:40 +01:00
daniel	9aa5d76963	Merge remote-tracking branch 'origin/develop' into ent-9662-second-round	2023-03-09 20:00:32 +01:00
Jose Gonzalez	ac1db7820c	Minor fixes	2023-03-09 17:41:29 +01:00
Jose Gonzalez	d4fa2831bf	Inventory tab	2023-03-09 16:44:45 +01:00
Pablo Aragon	cbc05f7ea0	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-09 15:15:06 +01:00
Pablo Aragon	2a97b26cfe	Admin tools	2023-03-09 15:14:47 +01:00
daniel	1a63f8070a	fixed styles	2023-03-09 15:06:03 +01:00
Jonathan	72a3cb0e3f	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-09 14:15:23 +01:00
Jonathan	1e2657fed3	Chart generator bug solution	2023-03-09 14:15:18 +01:00
Diego Muñoz-Reja	c977188e75	Merge branch 'ent-9883-mejora-de-informes-de-inventario-de-monitorizacion' into 'develop' ... Ent 9883 mejora de informes de inventario de monitorizacion See merge request artica/pandorafms!5490	2023-03-09 11:28:48 +00:00
daniel	f2123efa16	fixed styles	2023-03-09 11:32:50 +01:00
alejandro.campos@artica.es	4c926f1e04	fixed entities	2023-03-09 09:07:04 +01:00
alejandro.campos@artica.es	15afa2d976	Merge remote-tracking branch 'origin/develop' into ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre	2023-03-09 08:49:27 +01:00
daniel	e21d9968e8	fixed styles	2023-03-08 19:25:25 +01:00
Pablo Aragon	bb1d9c323d	Admin tools	2023-03-08 17:12:15 +01:00
Jose Gonzalez	c51c00f974	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 15:05:35 +01:00
Jose Gonzalez	f5daa72c6b	Scheduled downtime	2023-03-08 15:04:07 +01:00
Jose Gonzalez	0373cd3514	Scheduled downtime	2023-03-08 15:02:12 +01:00
Jonathan	862e1c0ad3	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 13:45:29 +01:00
Jonathan	91a708dfb8	SNMP Browser and agent module SNMP walk	2023-03-08 13:41:00 +01:00
Pablo Aragon	78eccfd73b	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 13:36:49 +01:00
Pablo Aragon	1a7e063c60	Alerts	2023-03-08 13:36:36 +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	abf8792ec9	#9073 fixed error error for multiple io_safe_input	2023-03-08 09:13:04 +01:00
Alejandro Campos	7c9b4c6944	Merge branch 'develop' into 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' ... # Conflicts: # pandora_console/godmode/reporting/map_builder.php	2023-03-07 17:05:08 +00:00
Daniel Cebrian	27005158ba	#9073 resolve conflics and bugs	2023-03-07 17:57:09 +01:00
Jose Gonzalez	5925cb0b2c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 17:50:57 +01:00
Jose Gonzalez	2dbc2e801f	Minor icon fixes	2023-03-07 17:24:36 +01:00
Pablo Aragon	dbd565fd1d	Alerts	2023-03-07 16:17:48 +01:00
Pablo Aragon	3ecbf1e4fa	Alerts	2023-03-07 16:17:01 +01:00
daniel	5a41c8b61c	fixed styles	2023-03-07 16:00:33 +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
Pablo Aragon	d529e6f384	Alerts	2023-03-07 15:59:36 +01:00
Jose Gonzalez	1b0fe3887f	Fixed issue with spinner	2023-03-07 15:08:03 +01:00
Daniel Maya	6b9175ea0d	Merge branch 'develop' into ent-9662-second-round	2023-03-07 15:05:28 +01:00
Jose Gonzalez	4ea1d697dc	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 15:00:40 +01:00
Jose Gonzalez	845a637082	Inventory modules forms	2023-03-07 14:59:59 +01:00
Jonathan	8dbcffaa8b	Buttons and view report	2023-03-07 14:15:02 +01:00
Jose Gonzalez	f01b18b965	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 14:11:23 +01:00
Jose Gonzalez	d4f900d1a4	Manage inventory icons	2023-03-07 14:11:20 +01:00
daniel	b316542044	fixed styles	2023-03-07 14:03:04 +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	dd68cc7a9e	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 11:48:20 +01:00
Jose Gonzalez	8f2a2f12c6	Templates view	2023-03-07 11:48:14 +01:00
Jonathan	d6a461acb8	Graph container create styles	2023-03-07 11:21:25 +01:00
Jonathan	89780a7085	Container graph visual	2023-03-07 09:53:19 +01:00
Pablo Aragon	6cb78d312f	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-07 09:52:05 +01:00
Pablo Aragon	6c6943c591	Alerts	2023-03-07 09:51:53 +01:00
Jose Gonzalez	1d93c666ba	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-07 09:51:23 +01:00
Jose Gonzalez	e860dea8ca	Manage agent groups	2023-03-07 09:41:24 +01:00
Pablo Aragon	62afce562f	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-07 08:28:22 +01:00
Pablo Aragon	5aac1a6152	Alerts	2023-03-07 08:28:10 +01:00
daniel	70d2223a46	fixed styles	2023-03-06 17:51:49 +01:00
daniel	5ba9e0e9aa	fixed styles	2023-03-06 16:21:10 +01:00
Daniel Cebrian	135793454c	#9073 added images	2023-03-06 12:20:08 +01:00
Jose Gonzalez	c48ec28743	Minor fixes	2023-03-06 10:35:34 +01: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	6846961ff0	Icon updates	2023-03-03 14:50:47 +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
Daniel Cebrian	7562a9253a	#10347 refactoring and add link to events in graph	2023-03-03 13:13:49 +01:00
alejandro.campos@artica.es	6cee279de7	fixed entities	2023-03-03 12:49:54 +01:00
Jonathan	5d73f96823	Graphs template wizard visual change	2023-03-03 12:41:32 +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
Alejandro Campos	3ddb3c1034	Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' ... # Conflicts: # pandora_console/extras/mr/62.sql # pandora_console/pandoradb.sql	2023-03-03 08:12:57 +00:00
daniel	5d7738a05e	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/extras/mr/62.sql pandora_console/include/ajax/module.php pandora_console/include/functions_ui.php pandora_console/operation/agentes/estado_agente.php pandora_console/operation/agentes/status_monitor.php pandora_console/operation/events/events.php	2023-03-03 08:20:44 +01:00
daniel	310ad88707	fixed styles	2023-03-02 19:25:31 +01:00
Jose Gonzalez	7a11ce4145	Visual Consoles	2023-03-02 17:24:52 +01:00
Daniel Cebrian	cdf359481a	#10347 cleared code for apply acl permission	2023-03-02 17:06:16 +01:00
Daniel Cebrian	af5a620883	#10347 fixed urls monitors and added name group	2023-03-02 16:22:25 +01:00
Jonathan	1c057773aa	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-02 14:35:05 +01:00
Jonathan	dd1b58b83a	Reporting Custom Graphs change visual	2023-03-02 14:35:01 +01:00
Daniel Cebrian	dc6256058f	#10347 added list agents in tactical view groups	2023-03-02 13:48:14 +01:00
Jose Gonzalez	9a295cf974	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-02 12:59:47 +01:00
Jose Gonzalez	d65852e9aa	Visual console	2023-03-02 12:59:40 +01:00
daniel	5f8e9a3e3c	fixed styles	2023-03-02 12:46:47 +01:00
Daniel Cebrian	a4a5650a01	#10347 added modal in heatmap agent	2023-03-02 11:10:37 +01:00
daniel	ad33accfda	fixed styles	2023-03-02 11:10:09 +01:00
Jonathan	fdab2cff8e	Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos	2023-03-02 08:26:53 +01:00
daniel	a5e6e569e8	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones	2023-03-02 08:04:00 +01:00
Daniel Cebrian	ea51399460	#10347 create view tactic for groups with monitoring and alerts	2023-03-01 17:27:32 +01:00
daniel	5d0d485efa	fixed styles	2023-03-01 14:18:27 +01:00
daniel	69d1bdd908	fixed styles	2023-03-01 13:44:01 +01:00
Daniel Rodriguez	23f91fa0f3	Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop' ... added all nodes option in sql query report item in meta See merge request artica/pandorafms!5535	2023-03-01 12:29:54 +00:00
Jonathan	7e4337e4f3	Reporting templates	2023-03-01 12:14:23 +01:00
daniel	a758528968	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/extras/mr/62.sql pandora_console/include/class/AuditLog.class.php	2023-03-01 07:56:32 +01:00
Pablo Aragon	c0ab435f4f	Events meta	2023-02-28 17:49:22 +01:00
Pablo Aragon	3dbe668973	Events meta	2023-02-28 17:47:49 +01:00
Jonathan	78af41b700	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-28 14:27:24 +01:00
Jonathan	8d44bb7af1	Reporting view new style	2023-02-28 14:27:18 +01:00
Diego Muñoz-Reja	44cf59bfd3	Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop' ... Ent 10253 enforcement de opciones de configuracion aviso en consola See merge request artica/pandorafms!5499	2023-02-28 12:27:54 +00:00
Jose Gonzalez	114e9a366f	Networkmap	2023-02-28 10:39:31 +01:00
Jonathan	d1ace9d560	SNMP filters mesage empty	2023-02-28 08:29:29 +01:00
daniel	f00f974c60	Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones ... Conflicts: pandora_console/godmode/alerts/alert_commands.php pandora_console/godmode/alerts/alert_templates.php pandora_console/godmode/groups/configure_modu_group.php pandora_console/godmode/groups/modu_group_list.php pandora_console/godmode/modules/manage_network_components.php pandora_console/godmode/users/user_list.php	2023-02-28 07:32:43 +01:00
Jonathan	dcdf0a5188	SNMP and reporting visual changes	2023-02-27 16:33:54 +01:00
Daniel Cebrian	3259795a0b	#10559 control delete task list if not exist id	2023-02-27 16:15:34 +01:00
Matias Didier	47ec49280c	Merge branch 'ent-10335-15016-edicion-comunidad-snmp-desdes-operaciones-masivas' into 'develop' ... Ent 10335 15016 edicion comunidad snmp desdes operaciones masivas See merge request artica/pandorafms!5520	2023-02-27 14:39:49 +00:00
Daniel Cebrian	c8096d73b2	Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola	2023-02-27 14:58:25 +01:00
Daniel Cebrian	2c7d00a664	Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola	2023-02-27 13:34:41 +01:00
Jonathan	87f17890f9	SNMP visual changes	2023-02-27 12:13:38 +01:00
Matias Didier	86b7e278ad	Merge branch 'ent-10493-reinicio-de-la-paginacion-al-interactuar-con-un-elemento' into 'develop' ... Ent 10493 reinicio de la paginacion al interactuar con un elemento See merge request artica/pandorafms!5556	2023-02-27 11:08:42 +00:00
Daniel Cebrian	08fb4e3396	#10324 fixed delete element in favmenu	2023-02-27 10:07:35 +01:00
Pablo Aragon	e024658520	10454-Events	2023-02-27 09:57:17 +01:00
Jonathan	9ed46e3b52	SNMP fix view	2023-02-27 09:41:39 +01:00
Jose Gonzalez	6c97fd16a2	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-24 14:34:52 +01:00
Jose Gonzalez	4e2af1d5f2	Fixes	2023-02-24 14:34:32 +01:00
daniel	7602ec1bd8	fixed styles	2023-02-24 14:28:07 +01:00
Jose Gonzalez	a6f1037c9a	Minor fixes or improvements	2023-02-24 13:37:47 +01:00
Daniel Cebrian	728991ad9a	#10324 delete fav menu when delete element	2023-02-24 13:36:13 +01:00
Daniel Cebrian	b367284d72	Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' ... # Conflicts: # pandora_console/include/class/ConsoleSupervisor.php	2023-02-24 11:09:16 +00:00
Jose Gonzalez	70216262a9	Minor fixes	2023-02-24 12:05:53 +01:00
Diego Muñoz-Reja	76dbaf46d2	Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop' ... Ent 10321 limitacion del numero de eventos See merge request artica/pandorafms!5513	2023-02-24 10:06:44 +00:00
Jonathan	4be8bbd9be	SNMP trap generatos create view	2023-02-24 10:30:51 +01:00
Jonathan	c4a0dc1934	SNMP views	2023-02-24 09:51:55 +01:00
alejandro.campos@artica.es	25bfc49055	minor fix	2023-02-23 18:04:04 +01:00
Jonathan	831579f9c8	Conflicto solution	2023-02-23 17:10:44 +01:00
Jonathan	a09c423284	SNMP views fix	2023-02-23 17:09:58 +01:00
daniel	fa81a4e744	restyling	2023-02-23 15:44:01 +01:00
Daniel Cebrian	0990fe672e	#10324 added system fav menu in agent and events	2023-02-23 09:48:13 +01:00
Jose Gonzalez	6180a42413	More pandora_black fixes	2023-02-22 21:19:28 +01:00
daniel	e514a0efb5	fixed styles	2023-02-22 17:41:19 +01:00
Jose Gonzalez	0380e8a10c	Ticket 10394 Black theme fixes	2023-02-22 16:24:11 +01:00
Jose Gonzalez	ec58cb4593	Plugins view	2023-02-22 14:19:57 +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
Jose Gonzalez	370ee54d9f	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-22 12:16:14 +01:00
Jose Gonzalez	bbde3e4181	Minor fixes	2023-02-22 12:15:17 +01:00
Matias Didier	c8109dadd3	Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop' ... Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de See merge request artica/pandorafms!5496	2023-02-22 10:15:26 +00:00
Pablo Aragon	95fb797a7e	10488-Fix views reports	2023-02-22 10:33:45 +01:00
Daniel Cebrian	2b7b49db20	#10493 fixed pagination in tags	2023-02-22 09:29:55 +01:00
Daniel Cebrian	2f1060af56	#10493 fixed pagination in collection	2023-02-22 09:05:27 +01:00
Daniel Cebrian	dfadbb0f80	#10493 added pagination in group module	2023-02-21 16:51:05 +01:00
Daniel Cebrian	f9c3524be8	#10493 fixed pagination in profiles	2023-02-21 16:05:24 +01:00
Daniel Cebrian	2b185b5754	#10493 fixed pagination in alerts	2023-02-21 15:44:41 +01:00
alejandro.campos@artica.es	6c64ccd6d6	implemented consoles management	2023-02-21 15:32:45 +01:00
Jose Gonzalez	1d566b4d18	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-02-21 14:15:05 +01:00
Jose Gonzalez	2fd52eff48	Sprint 2025Feb Improve UI-UX and Resources views	2023-02-21 14:14:13 +01:00
Pablo Aragon	80818d7b6e	10489-Fix alerts edition and event response	2023-02-21 13:18:44 +01:00
Jose Gonzalez	13aa4e77f1	Fix minor issues	2023-02-20 17:49:02 +01:00