5694 Commits

Author	SHA1	Message	Date
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