5845 Commits

Author	SHA1	Message	Date
Daniel Cebrian	05ec992fac	#12522 enhanced audit log	2023-12-27 16:05:34 +01:00
Daniel Cebrian	bb92202ba2	#12706 fixed events groups by agent	2023-12-26 18:33:31 +01:00
Daniel Cebrian	adffdc3cd0	#12706 fixed line break in events metaconsole	2023-12-26 16:55:14 +01:00
Jonathan	a29452de3d	#12539 1 sec to 4 sec ok button	2023-12-22 13:12:55 +01:00
Daniel Maya	7390336da0	#12697 Fixed search	2023-12-22 12:55:21 +01:00
Jonathan	6a7eca83df	#12539 message 200 modules agent	2023-12-22 12:16:34 +01:00
daniel	1b034d696c	fix timezone events pandora_enterprise#12677	2023-12-20 13:54:20 +01:00
Rafael Ameijeiras	8658dbc938	Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop' ... fix error js load modal filter sound events pandora_enterprise#12607 See merge request artica/pandorafms!6739	2023-12-20 10:21:51 +00:00
Daniel Rodriguez	477a9d665e	Merge branch 'ent-12067-huevo-de-pascua-piensa-en-verde' into 'develop' ... Ent 12067 huevo de pascua piensa en verde See merge request artica/pandorafms!6698	2023-12-19 18:05:44 +00:00
Jonathan	d68daca985	#11900 counter items	2023-12-19 16:50:36 +01:00
Rafael Ameijeiras	46b315fbaf	Merge branch 'ent-12643-conteo-paginacion-de-eventos-no-funciona' into 'develop' ... Ent 12643 conteo paginacion de eventos no funciona See merge request artica/pandorafms!6781	2023-12-19 15:05:05 +00:00
daniel	e07f66885d	Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde ... Conflicts: pandora_console/index.php	2023-12-19 14:56:04 +01:00
daniel	d57f0971b6	Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center ... Conflicts: pandora_console/include/javascript/pandora.js	2023-12-19 14:41:12 +01:00
Jonathan	8a9fbbac8b	#12515 event title ... over 300 characters	2023-12-18 16:32:39 +01:00
Jonathan	5c047fc1b5	#12657 entries order function datatables	2023-12-18 14:46:44 +01:00
daniel	8aeee6d876	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-12-18 11:15:18 +01:00
daniel	d56e3a5496	fix rerors duplicate in CVS pandora_enterprise#9640	2023-12-18 11:14:55 +01:00
Rafael Ameijeiras	3dd082c60f	Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop' ... Ent 12647 Salto de linea en nombre de evento See merge request artica/pandorafms!6777	2023-12-18 07:52:31 +00:00
Diego Muñoz-Reja	5a9f888ecc	Merge branch 'ent-12649-traza-olvidada' into 'develop' ... Ent 12649 traza olvidada See merge request artica/pandorafms!6779	2023-12-18 07:07:12 +00:00
Matias Didier	9158b43945	Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop' ... move extension translate_string and file_repo pandora_enterprise#12333 See merge request artica/pandorafms!6706	2023-12-15 11:49:11 +00:00
Jonathan	f35e7d52ed	#12643 fix pagination	2023-12-15 11:34:27 +01:00
Daniel Maya	971db37147	#12649 remove trace	2023-12-15 10:19:52 +01:00
daniel	70dd1719db	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-12-15 09:13:07 +01:00
daniel	0584b9afd0	Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center	2023-12-15 09:12:39 +01:00
daniel	e14a2bcb67	fix times sound events pandora_enterprise#12607	2023-12-15 09:11:05 +01:00
Diego Muñoz-Reja	fe3aa7f745	Merge branch 'ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map' into 'develop' ... Ent 11166 vista de datos de netflow por defecto network usage map See merge request artica/pandorafms!6427	2023-12-15 07:19:46 +00:00
Diego Muñoz-Reja	b545cfec23	Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop' ... Optimiized monitors view See merge request artica/pandorafms!6627	2023-12-15 07:18:13 +00:00
Daniel Cebrian	67ffe8627b	#12647 fixed line break in event list	2023-12-14 19:08:34 +01:00
daniel	cf692ba7ef	fix times sound events pandora_enterprise#12607	2023-12-14 17:07:03 +01:00
daniel	9e3c17bf2c	Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center	2023-12-14 16:32:33 +01:00
daniel	06f6c7d16f	Merge remote-tracking branch 'origin/develop' into ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map ... Conflicts: pandora_console/operation/network/network_usage_map.php	2023-12-14 16:13:25 +01:00
daniel	3cb4b5cce4	Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql ... Conflicts: pandora_console/extras/delete_files/delete_files.txt pandora_console/extras/mr/67.sql pandora_console/operation/menu.php	2023-12-14 11:21:51 +01:00
daniel	2890fd3dab	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/styles/pandora.css	2023-12-14 11:05:29 +01:00
Rafael Ameijeiras	e71a104e74	Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop' ... Draft: Ent 12566 Mejoras en visualización de eventos See merge request artica/pandorafms!6735	2023-12-14 08:57:44 +00:00
Rafael Ameijeiras	d5b3bd1c02	Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop' ... Ent 12483 varios bugs en la vista de campos personalizados See merge request artica/pandorafms!6689	2023-12-14 08:42:02 +00:00
Rafael Ameijeiras	f3d190a8bb	Merge branch 'ent-8365-ncm-fase-3' into 'develop' ... Ent 8365 ncm fase 3 See merge request artica/pandorafms!6612	2023-12-14 08:40:31 +00:00
Rafael Ameijeiras	dcdd3e139e	Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop' ... Ent 12468 instrucciones se rompen en vista de eventos See merge request artica/pandorafms!6711	2023-12-14 08:39:44 +00:00
Jonathan	53b56b31af	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-12-14 08:38:52 +01:00
Daniel Cebrian	fed0d92805	#12566 fixed colums module_custom_id and event_custom_id length_	2023-12-13 19:53:14 +01:00
miguel angel rasteu	e80e7d6996	#11510 Resolve conflicts	2023-12-13 12:08:08 +01:00
Jonathan	5fa9cd5877	Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3	2023-12-13 11:19:32 +01:00
daniel	f4d2a40f13	Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center	2023-12-13 10:58:57 +01:00
daniel	cc12c77008	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/styles/pandora.css	2023-12-13 10:39:48 +01:00
alejandro.campos@artica.es	160514cfbe	fix filter bug	2023-12-13 10:08:13 +01:00
Jonathan	5279bb3e17	Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes	2023-12-13 08:24:43 +01:00
Daniel Cebrian	1a9bdf97d1	#12566 changes in view events	2023-12-11 17:01:40 +01:00
Rafael Ameijeiras	7f75445d75	Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop' ... Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0 See merge request artica/pandorafms!6410	2023-12-11 14:30:51 +00:00
Rafael Ameijeiras	94211ac75d	Merge branch 'ent-11107-permitir-solamente-extension-mib-en-el-mib-uploader' into 'develop' ... Fix upload file function filter by extension. Fix mib uploader only upload .mib file See merge request artica/pandorafms!6601	2023-12-11 14:29:57 +00:00
Rafael Ameijeiras	d072187a2c	Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop' ... fix error 500 and warnings pandora_enterprise#12605 See merge request artica/pandorafms!6738	2023-12-11 14:27:39 +00:00
daniel	a418673489	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-12-11 11:09:54 +01:00
Jonathan	49fd9435dd	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-12-11 10:13:46 +01:00
Rafael Ameijeiras	1e2f573a3b	Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop' ... Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona See merge request artica/pandorafms!6673	2023-12-11 08:28:56 +00:00
Daniel Cebrian	7f4dc4fbe4	#12460 fixed log deprecated	2023-12-11 09:18:40 +01:00
Matias Didier	385989f185	Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop' ... VC Public links pandora_enterprise#12329 See merge request artica/pandorafms!6633	2023-12-07 15:27:57 +00:00
Jonathan	78bb8e0bae	#8365 ix merge conflict	2023-12-07 10:58:45 +01:00
daniel	5c6f11511c	fix error events sound modal pandora_enterprise#12607	2023-12-05 16:48:12 +01:00
daniel	1d36d8a436	fix error 500 and warnings pandora_enterprise#12605	2023-12-05 09:14:02 +01:00
daniel	77cf0ce6ca	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/styles/pandora.css	2023-12-05 08:02:55 +01:00
Daniel Cebrian	ea474ecd89	#12566 changes in events table	2023-12-04 15:05:01 +01:00
Jorge Rincon	cc1c138552	#12518 Fixed up custom field type link	2023-12-04 11:23:43 +01:00
Rafael Ameijeiras	e91230b165	Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop' ... Ent 12440 16596 agregar acl operation events events no hace nada See merge request artica/pandorafms!6713	2023-12-04 08:12:48 +00:00
Jonathan	1fb98d34ae	#12296 fix conflict merge develop	2023-12-01 11:59:03 +01:00
Rafael Ameijeiras	aa9aa40ebd	Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop' ... Ent 12213 cambiar update manager por warp update See merge request artica/pandorafms!6546	2023-12-01 10:07:07 +00:00
miguel angel rasteu	b89f182e19	#12213 Resolve conflicts	2023-12-01 10:31:50 +01:00
miguel angel rasteu	5ee6eb7306	#12052 Resolve conflicts	2023-12-01 10:19:39 +01:00
Daniel Rodriguez	39c6420d2c	Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' ... Ent 11763 15982 regex en busqueda de eventos See merge request artica/pandorafms!6512	2023-12-01 08:44:46 +00:00
Jonathan	c41b360a6e	#8365 merge conflict	2023-11-30 12:04:28 +01:00
Jorge Rincon	03fea82124	#12524 fixed opening items in new tabs Monitoring and Alerts view	2023-11-30 08:45:34 +01:00
Jonathan	b99c9240de	#8365 NCM Merge conflict	2023-11-30 08:32:15 +01:00
Jonathan	75d57337af	#11705 Fix merge conflict	2023-11-30 08:10:32 +01:00
Jonathan	e8272c0006	#11763 Fix merge conflict	2023-11-30 07:57:25 +01:00
Daniel Cebrian	f1a8c4b31d	#12541 change message export graph	2023-11-29 16:12:12 +01:00
Daniel Cebrian	b6722214de	#12541 changes in graph analytics	2023-11-29 15:43:38 +01:00
Rafael Ameijeiras	60d9fffe22	Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' ... Ent 12137 propuesta de refactoring visual de vista ppal de agente See merge request artica/pandorafms!6520	2023-11-29 14:26:53 +00:00
Jonathan	4c25e4cab1	#12440 add operation/events/events check readonly	2023-11-29 11:55:59 +01:00
Jonathan	f86a3e60e8	#11763 save filter regex on bbdd	2023-11-29 11:14:40 +01:00
Daniel Maya	892048554e	#12468 Fixed instructions	2023-11-29 10:27:55 +01:00
daniel	5bd689500c	move extension translate_string and file_repo pandora_enterprise#12333	2023-11-28 11:06:39 +01:00
Jonathan	49a81b34c4	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-28 09:50:48 +01:00
Jonathan	9819c3a5ff	Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos	2023-11-28 08:30:23 +01:00
daniel	f6f0f15731	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/godmode/reporting/reporting_builder.item_editor.php pandora_console/include/graphs/fgraph.php pandora_console/include/lib/Dashboard/Widgets/single_graph.php pandora_console/include/styles/pandora.css	2023-11-28 08:29:10 +01:00
daniel	3f3e8e42bc	move extension translate_string and file_repo pandora_enterprise#12333	2023-11-28 08:13:00 +01:00
Jonathan	def169abb8	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-11-28 07:58:50 +01:00
Rafael Ameijeiras	215c665a9c	Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop' ... Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta See merge request artica/pandorafms!6565	2023-11-27 14:51:48 +00:00
Rafael Ameijeiras	4ac9316391	Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop' ... Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas See merge request artica/pandorafms!6475	2023-11-27 14:51:02 +00:00
Rafael Ameijeiras	8e68198ab5	Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop' ... Ent 11679 15855 nombres de modulos no tienen link a su edicion See merge request artica/pandorafms!6422	2023-11-27 14:39:14 +00:00
Rafael Ameijeiras	707f85ed7f	Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop' ... Ent 11511 cambiar el apartado de tools a seccion management See merge request artica/pandorafms!6403	2023-11-27 14:36:38 +00:00
miguel angel rasteu	e967b5820a	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-27 13:06:51 +01:00
miguel angel rasteu	cac31cc482	#12137 Resolve conflicts	2023-11-27 13:05:43 +01:00
Rafael Ameijeiras	074ea7a9c9	Merge branch 'ent-12159-16357-cuadro-de-busqueda-no-muestra-agentes-cuando-se-busca-con-un-guion-bajo' into 'develop' ... Ent 12159 16357 cuadro de busqueda no muestra agentes cuando se busca con un guion bajo See merge request artica/pandorafms!6519	2023-11-27 11:58:59 +00:00
Matias Didier	c7d28b9a77	Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop' ... Fix pagination interfaces pandora_enterprise#12356 See merge request artica/pandorafms!6626	2023-11-27 11:38:19 +00:00
Rafael Ameijeiras	63f5396d30	Merge branch 'ent-12043-cve-2023-41814-vulnerabilidad-xss-mensajes' into 'develop' ... Ent 12043 cve 2023 41814 vulnerabilidad xss mensajes See merge request artica/pandorafms!6492	2023-11-27 11:20:10 +00:00
miguel angel rasteu	b0125d943e	#12138 Resolve conflict	2023-11-27 11:51:00 +01:00
miguel angel rasteu	a4cd6d7fe1	#12138 Resolve conflict	2023-11-27 11:43:24 +01:00
Rafael Ameijeiras	5d94be5e7f	Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop' ... Ent 12134 contador de agentes modulos en las vistas See merge request artica/pandorafms!6566	2023-11-27 10:42:01 +00:00
Rafael Ameijeiras	e5c708298b	Merge branch 'ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged' into 'develop' ... add new type search status events not in process pandora_enterprise#11760 See merge request artica/pandorafms!6491	2023-11-27 10:41:28 +00:00
Diego Muñoz-Reja	59bed70175	Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' ... Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos See merge request artica/pandorafms!6532	2023-11-27 10:32:34 +00:00
miguel angel rasteu	262affeb74	Merge branch 'develop' into ent-12138-eliminar-agent-access-graph	2023-11-27 08:18:35 +01:00
Jorge Rincon	b4e07c8ce7	#12067 Added easter egg, think green	2023-11-23 17:31:11 +01:00
Jonathan	4f707a5a1b	Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos	2023-11-23 09:27:46 +01:00
Jorge Rincon	b6582b7f7e	#12202 added Asteroids game	2023-11-22 13:30:44 +01:00
Daniel Maya	6fc6bead65	#12483 Fixed custom fields view	2023-11-21 16:17:41 +01:00
Jorge Rincon	d389f9c3d1	#12439 Added Quiet icon to agent finder	2023-11-16 11:15:01 +01:00
miguel angel rasteu	99c5da677d	#12137 Fix entities	2023-11-16 08:37:41 +01:00
miguel angel rasteu	8b9d52646c	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-16 08:06:20 +01:00
Daniel Maya	804970719d	#12385 Fixed group	2023-11-15 16:32:02 +01:00
Daniel Maya	6059f4dea0	#12453 Changed string	2023-11-15 13:10:19 +01:00
Jonathan	4fec6a1ccb	#12296 restyling agent detail filters	2023-11-14 17:04:31 +01:00
Daniel Rodriguez	7fdca7aa12	Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop' ... Add support for inventory vulnerability scans. See merge request artica/pandorafms!6487	2023-11-13 08:24:48 +00:00
Rafael Ameijeiras	8c26dbe973	Merge branch 'ent-12423-error-en-vista-de-alertas-de-un-agente-visor' into 'develop' ... Remove filter group for alert pandora_enterprise#12423 See merge request artica/pandorafms!6640	2023-11-10 13:09:28 +00:00
Ramon Novoa	8ec1432414	Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner	2023-11-10 09:53:17 +01:00
Jonathan	80d85c1149	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-08 15:29:14 +01:00
Jonathan	82759ae12f	#11763 regex events	2023-11-08 15:24:47 +01:00
Matias Didier	ca8d0ed7f8	Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop' ... Ent 12376 Problemas vistos en la nueva vista táctica See merge request artica/pandorafms!6628	2023-11-08 13:36:10 +00:00
Jonathan	1d065c2fbb	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-08 14:16:09 +01:00
daniel	9ccb6a98c6	fix alert details pandora_enterprise#12423	2023-11-08 12:49:45 +01:00
daniel	5bc1cb1862	Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged	2023-11-08 09:48:46 +01:00
daniel	c81b42cc95	Remove filter group for alert pandora_enterprise#12423	2023-11-07 16:17:13 +01:00
Daniel Cebrian	8f8e5ecf45	#12376 multiple changes in general tactical view	2023-11-07 13:18:44 +01:00
daniel	aaa590b65f	VC Public links pandora_enterprise#12329	2023-11-07 09:20:48 +01:00
Jonathan	545316e9a8	#11763 regex fix html entities	2023-11-07 08:35:49 +01:00
Jonathan	94d5d58636	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-07 08:31:18 +01:00
miguel angel rasteu	de22886cec	#11679 Fix edit module link in search and fix checkbox switch bug in edit module	2023-11-06 08:55:21 +01:00
Calvo	92ee718f91	Optimiized monitors view	2023-11-03 17:48:15 +01:00
daniel	84d450e35e	Fix pagination interfaces pandora_enterprise#12356	2023-11-03 13:10:09 +01:00
miguel angel rasteu	c2b3eb14bf	Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion	2023-11-03 09:43:04 +01:00
miguel angel rasteu	88f1b964e3	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-02 15:22:57 +01:00
miguel angel rasteu	3822ffc0f0	#12137 Fix agent view	2023-11-02 15:22:49 +01:00
miguel angel rasteu	47aeb3cc39	#12137 Fix Description	2023-11-02 13:22:42 +01:00
Daniel Maya	4c368e5da5	#12344 Fixed filter 3	2023-11-02 12:33:30 +01:00
Daniel Maya	ed1ae83770	#12344 Fixed log source	2023-10-30 15:15:53 +01:00
Jorge Rincon	ad81b26556	Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3	2023-10-30 10:20:31 +01:00
Jorge Rincon	84b9ac14fb	#8365Added viewer report for ncm backups	2023-10-30 10:18:29 +01:00
Rafael Ameijeiras	2fbc72a49a	Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' ... Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2 See merge request artica/pandorafms!6603	2023-10-30 08:31:09 +00:00
Jonathan	c01af3e9b6	Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3	2023-10-30 08:37:37 +01:00
Jorge Rincon	407a505a3e	#8365 Added reports for ncm backups.	2023-10-27 14:32:48 +02:00
daniel	04a8717aed	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/lib/Dashboard/Widgets/single_graph.php	2023-10-25 15:58:10 +02:00
daniel	868700f9f1	add sliced mode simple graph reports and CV pandora_enterprise#9640	2023-10-25 15:55:54 +02:00
Rafael Ameijeiras	50d3139dc7	Merge branch 'ent-10602-Inventory-widget-2' into 'develop' ... Ent 10602 inventory widget 2 See merge request artica/pandorafms!6589	2023-10-25 11:07:55 +00:00
Jonathan	08140b87a7	#12286 no enable click user not logged public VC	2023-10-25 12:29:55 +02:00
Daniel Cebrian	a862a8018c	#11126 added token in config agent and setup	2023-10-24 18:02:14 +02:00
Daniel Cebrian	f3fe59bfda	#12288 fixed spinner in button link	2023-10-24 14:53:34 +02:00
Daniel Cebrian	638ba75894	#12288 fixed spinner in empty page	2023-10-24 14:18:48 +02:00
Daniel Cebrian	490e39c2d8	Merge branch 'develop' into ent-11126-vulnerability-scanner-interface	2023-10-24 13:43:31 +02:00
daniel	d8dfaf0fe3	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-23 17:02:51 +02:00
Daniel Cebrian	f419f0931d	#12288 fixed filters in netflow explorer	2023-10-23 16:20:32 +02:00
Daniel Cebrian	8d624fe371	Merge branch 'develop' into ent-12288-varios-bugs-en-netflow	2023-10-23 14:59:20 +02:00
alejandro.campos@artica.es	a747b8fa56	fix	2023-10-23 14:09:38 +02:00
Diego Muñoz-Reja	48c314669a	Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop' ... Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización) See merge request artica/pandorafms!6485	2023-10-23 07:24:20 +00:00
Calvo	fdb800c712	Fix upload file function filter by extension. Fix mib uploader only upload .mib file	2023-10-20 13:43:28 +02:00
Daniel Cebrian	7bee2a9784	#12288 fixed translate	2023-10-20 10:15:48 +02:00
Daniel Cebrian	04e001c010	#12288 fixed string translate	2023-10-20 10:10:27 +02:00
daniel	6ad9b27df8	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-20 10:08:20 +02:00
Matias Didier	dcd891eedb	Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' ... Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2 See merge request artica/pandorafms!6578	2023-10-20 05:51:32 +00:00
Daniel Cebrian	7bba90cd4f	#12288 added spinner in netflow and fixed bug filter	2023-10-19 17:18:13 +02:00
Jonathan	98388bb7d2	#12286 fix dashboard vulnerability login admin	2023-10-19 17:06:01 +02:00
Rafael Ameijeiras	796282086c	Merge branch 'ent-11639-15813-neflow-tener-2-fuentes-de-datos-a-monitorizar' into 'develop' ... Ent 11639 [#15813] Neflow: Tener 2 fuentes de datos a monitorizar See merge request artica/pandorafms!6577	2023-10-19 14:23:23 +00:00
Daniel Cebrian	b1b7a1e57d	#10194 fixed acl in view	2023-10-19 16:18:36 +02:00
Daniel Cebrian	8259f4a503	#11639 fixed router_ip in netflow	2023-10-19 10:58:30 +02:00
Jonathan	42aa751d29	#12286 fix issue logout public link visual console	2023-10-19 10:53:20 +02:00
Daniel Cebrian	8aa1e88317	#12191 optimized command netflow and sflow	2023-10-18 19:02:27 +02:00
daniel	4fb7e1719b	add periodicity graph pandora_enterprise#9640	2023-10-18 12:49:47 +02:00
Rafael Ameijeiras	2451eaff62	Merge branch 'ent-12073-consola-sonora-no-funciona-si-la-pestana-se-minimiza' into 'develop' ... Ent 12073 consola sonora no funciona si la pestana se minimiza See merge request artica/pandorafms!6495	2023-10-17 12:25:58 +00:00
miguel angel rasteu	7b443414ca	#12137 Fix graph events height	2023-10-17 09:52:56 +02:00
miguel angel rasteu	1c609374a8	#12134 Count total modules	2023-10-17 09:27:53 +02:00
miguel angel rasteu	c00445eab0	#121773 Fix module name in events view	2023-10-17 09:05:22 +02:00
miguel angel rasteu	be99b512e2	#12137 Fix events graph	2023-10-17 08:41:06 +02:00
Daniel Cebrian	d54a6faede	#10194 adjust bars 24 hrs in events and changed numbers	2023-10-16 20:47:47 +02:00
Daniel Cebrian	9237e4038a	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-10-16 17:10:33 +02:00
Daniel Cebrian	2a4f8ce646	Merge branch 'develop' into ent-11126-vulnerability-scanner-interface	2023-10-16 16:56:29 +02:00
Rafael Ameijeiras	2c76e30591	Merge branch 'ent-11075-cambiar-apostrofe-en-apartado-de-creacion-de-mapas-de-red' into 'develop' ... Ent 11075 cambiar apostrofe en apartado de creacion de mapas de red See merge request artica/pandorafms!6510	2023-10-16 10:07:13 +00:00
Daniel Cebrian	533201197a	#11126 new view vulnerabilities scanner	2023-10-13 12:25:25 +02:00
miguel angel rasteu	5060398661	#11206 Fix conflict	2023-10-13 09:00:03 +02:00
miguel angel rasteu	f058ec5df8	#12213 Fix warp update notification	2023-10-11 08:12:55 +02:00
Daniel Cebrian	a02482ac5d	#10194 added links	2023-10-10 15:15:43 +02:00
miguel angel rasteu	133826b498	#12205 Fix ehorus conf interfaz	2023-10-10 09:57:09 +02:00
Daniel Cebrian	9b675868b9	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-10-09 16:43:25 +02:00
daniel	db6f53760e	Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged	2023-10-06 13:04:04 +02:00
Daniel Cebrian	2228011812	#11126 new view vulnerability scanner	2023-10-04 17:37:42 +02:00
miguel angel rasteu	09cae778c5	#12153 Create event list graph	2023-10-04 16:28:40 +02:00
miguel angel rasteu	27bee15d50	#12172 Change truncate event name limit to description_size_text	2023-10-04 12:56:28 +02:00
miguel angel rasteu	874cb9c52a	#12153 Create button and ajax request	2023-10-04 12:41:23 +02:00
Alejandro Campos	0f381b0db7	Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' ... # Conflicts: # pandora_console/extras/mr/66.sql	2023-10-03 13:11:09 +00:00
miguel angel rasteu	f27d4176ea	#12137 Fix OS version	2023-10-03 10:58:59 +02:00
miguel angel rasteu	2b416382a4	#12138 Fix agent main view	2023-10-03 10:26:57 +02:00
miguel angel rasteu	384a66dc0d	#12137 Fix refact	2023-10-03 09:35:10 +02:00
alejandro.campos@artica.es	0771094e85	minor changes	2023-10-02 16:42:32 +02:00
miguel angel rasteu	3f41e4f32b	#12138 delete agent access graph	2023-10-02 16:24:23 +02:00
miguel angel rasteu	340288d785	#12137 visual refactoring for main agent view	2023-10-02 15:25:24 +02:00
Rafael Ameijeiras	b0d12c8a18	Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop' ... Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto See merge request artica/pandorafms!6496	2023-10-02 11:23:35 +00:00
miguel angel rasteu	4d345ab74d	#12159 Fix search agent width _	2023-10-02 12:00:13 +02:00
Daniel Cebrian	b8df74dace	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-09-28 16:22:58 +02:00
Diego Muñoz-Reja	b84ffc124b	Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop' ... fix show comment events ticket pandora_enterprise#12066 See merge request artica/pandorafms!6488	2023-09-28 14:06:30 +00:00
Jonathan	6db13cc55a	merge conflict solution	2023-09-28 13:14:49 +02:00
Daniel Rodriguez	05cd8142bf	Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' ... wip integration integriaIMS pandora_enterprise#11471 Closes pandora_enterprise#11471 See merge request artica/pandorafms!6131	2023-09-28 10:05:15 +00:00
Jonathan	4eb0e69e29	#11763 new regex filter events	2023-09-28 10:11:55 +02:00
miguel angel rasteu	a4345c8ae4	#11075 Fix apostrophe	2023-09-27 16:08:55 +02:00
Daniel Cebrian	62d501e6d5	#10194 sections Alerts and Events	2023-09-27 13:30:56 +02:00
Rafael Ameijeiras	03700d2653	Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop' ... refactor cluster view pandora_enterprise#12032 See merge request artica/pandorafms!6476	2023-09-26 15:15:27 +00:00
Rafael Ameijeiras	a69550c733	Merge branch 'ent-12071-16277-columna-secondary-groups-en-la-vista-de-inventario-no-muestra-nada' into 'develop' ... Fix inventory view agent secondary groups See merge request artica/pandorafms!6456	2023-09-26 15:14:47 +00:00
Jorge Rincon	db7a5e121d	Add the None option to the date filter to prioritize the period of the report items.	2023-09-25 17:10:43 +02:00
daniel	91393c9e39	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/include/styles/pandora.css	2023-09-25 17:06:08 +02:00
miguel angel rasteu	550bd0e6ba	#12073 Add tip	2023-09-25 15:39:48 +02:00
Rafael Ameijeiras	60c3bb456a	Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop' ... Ent 12099 cabecera de filtros descuadrada en informes vista html See merge request artica/pandorafms!6480	2023-09-25 11:22:08 +00:00
Jorge Rincon	32c47c97ed	The XSS vulnerability is corrected by adding entities to the Subject field	2023-09-25 12:29:25 +02:00
daniel	2e63546550	add new type search status events not in process pandora_enterprise#11760	2023-09-25 11:29:38 +02:00
miguel angel rasteu	4b999b79d3	#12099 Fix filter position	2023-09-25 10:57:46 +02:00
Jonathan	e5c5f91576	#11705 change name event_custom_id	2023-09-25 10:32:23 +02:00
Diego Muñoz-Reja	5079cb9256	Merge branch 'ent-12044-consola-acustica-rota-en-version-open' into 'develop' ... Ent 12044 consola acustica rota en version open See merge request artica/pandorafms!6469	2023-09-25 08:23:34 +00:00
miguel angel rasteu	9a5a1f02bf	#12099 Fix filter position	2023-09-25 09:55:55 +02:00
Rafael Ameijeiras	b1c3eb7f3c	Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop' ... Ent 12100 graph analysis no puedo exportar a grafica combinada See merge request artica/pandorafms!6483	2023-09-25 07:11:48 +00:00
miguel angel rasteu	f2bda1e58d	#12099 Fix filter position	2023-09-22 13:05:29 +02:00
daniel	c6a04d5d8f	fix show comment events ticket pandora_enterprise#12066	2023-09-22 12:56:01 +02:00
Jonathan	79fe89c3c5	#11705 new custom_field tevento	2023-09-22 12:24:15 +02:00
Diego Muñoz-Reja	576ee1bf37	Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop' ... Ent 11965 Security hardening: Console - Vistas estaticas See merge request artica/pandorafms!6370	2023-09-21 14:57:06 +00:00
miguel angel rasteu	e637866f72	#12100 Fix custom graph	2023-09-21 16:11:58 +02:00
miguel angel rasteu	d7f774bf57	#12099 Fix filter header	2023-09-21 13:12:11 +02:00
daniel	f46626e120	refactor cluster view pandora_enterprise#12032	2023-09-21 10:21:45 +02:00
miguel angel rasteu	98bdee7037	#12079 Apply the filter automatic	2023-09-21 09:24:35 +02:00
alejandro.campos@artica.es	ae74caf7b1	Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada	2023-09-20 15:52:56 +02:00
Rafael Ameijeiras	2f95504038	Merge branch 'ent-12001-modulos-de-inventario-no-se-muestran' into 'develop' ... Ent 12001 Módulos de inventario no se muestran See merge request artica/pandorafms!6465	2023-09-20 13:49:07 +00:00
alejandro.campos@artica.es	6f8212ed40	Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada	2023-09-20 15:46:47 +02:00
Daniel Cebrian	73d179e52f	#12001 added autoselect module in inventory	2023-09-20 12:14:55 +02:00
Jonathan	fcefe5a225	#12044 fix acoustic console open error 500	2023-09-20 12:07:19 +02:00
Daniel Cebrian	32b7a103eb	#12001 fixed list modules when select agent	2023-09-19 17:26:36 +02:00
Daniel Cebrian	1465400fb6	#12001 fixed filter in inventary	2023-09-19 16:22:58 +02:00
miguel angel rasteu	d83c1a81d2	#12052 Fix filter alter detail view	2023-09-19 13:50:06 +02:00
Daniel Cebrian	b85d622d51	Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas	2023-09-18 16:52:57 +02:00
Daniel Cebrian	a1fd85f486	Merge branch 'develop' into ent-11807-security-hardening-console-informes	2023-09-18 16:49:00 +02:00
Daniel Rodriguez	6ecd8ca899	Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' ... Draft: Ent 10065 post filtros de eventos privados See merge request artica/pandorafms!6318	2023-09-18 07:55:18 +00:00
Rafael Ameijeiras	b568085841	Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop' ... not show edition buttons of alert detail pandora_enterprise#12035 See merge request artica/pandorafms!6444	2023-09-18 07:22:13 +00:00
Daniel Cebrian	25e0834db0	Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas	2023-09-15 14:57:18 +02:00
Calvo	9394446a1e	Fix inventory view agent secondary groups	2023-09-15 13:46:29 +02:00
Daniel Cebrian	2844dfd4f0	#11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports	2023-09-15 13:34:07 +02:00
daniel	09bcedde62	ITSM pandora_enterprise#11471	2023-09-14 16:36:52 +02:00
daniel	af968b5e13	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-14 08:08:05 +02:00
miguel angel rasteu	91aee79ab2	#12037 Resolve conflicts	2023-09-12 15:07:00 +02:00
daniel	802f0bf83b	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-12 12:37:31 +02:00
daniel	16f1d80919	not show edition buttons of alert detail pandora_enterprise#12035	2023-09-12 12:30:52 +02:00
Rafael Ameijeiras	bab81b08e2	Merge branch 'ent-10676-14689-aumento-agentes-en-monitors-view' into 'develop' ... Ent 10676 14689 aumento agentes en monitors view See merge request artica/pandorafms!6426	2023-09-12 07:23:33 +00:00
miguel angel rasteu	fddf204a1b	#10676 Fix module text size	2023-09-11 15:18:25 +02:00
Rafael Ameijeiras	0d0380f37d	Merge branch 'ent-12017-icono-para-ver-informe-cambia' into 'develop' ... Ent 12017 icono para ver informe cambia See merge request artica/pandorafms!6431	2023-09-11 11:35:39 +00:00
Rafael Ameijeiras	5aa2c5e0e8	Merge branch 'ent-12012-Busqueda-de-agentes-en-version-Community-no-funciona' into 'develop' ... fix agent search in community versoin See merge request artica/pandorafms!6419	2023-09-11 11:34:30 +00:00
miguel angel rasteu	55fa824792	#12037 Fix size of agent text and event text	2023-09-11 11:41:30 +02:00
Jorge Rincon	764d5908bb	Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados	2023-09-11 10:58:37 +02:00
miguel angel rasteu	95f84b975c	#12017 Fix see details icon	2023-09-11 10:40:39 +02:00
miguel angel rasteu	99f92b9bec	#10676 Fix truncate text	2023-09-11 10:09:34 +02:00
Rafael Ameijeiras	0c6aaa6723	Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop' ... Ent 11993 user notifications esta roto See merge request artica/pandorafms!6412	2023-09-11 07:15:38 +00:00
daniel	ce0468b37e	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/include/functions_menu.php	2023-09-08 13:11:52 +02:00
Matias Didier	ef544fffbb	Merge branch 'ent-11996-bugs-en-projection-graphs' into 'develop' ... Ent 11996 bugs en projection graphs See merge request artica/pandorafms!6421	2023-09-08 10:41:14 +00:00