5822 Commits

Author	SHA1	Message	Date
Daniel Cebrian	df92200c09	#12999 fixed margin height	2024-03-08 09:40:40 +01:00
Daniel Cebrian	749fd9243c	#12999 resize window when change scale	2024-03-08 09:21:09 +01:00
Daniel Cebrian	09880cadf1	#12999 fixed modal resize	2024-03-07 17:58:56 +01:00
Jonathan	15be9df26f	#12594 schedule fix	2024-02-29 17:47:28 +01:00
Jonathan	b4ad2b7584	#12594 schedule view	2024-02-27 19:15:50 +01:00
daniel	9771639318	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 ... Conflicts: pandora_console/extras/mr/68.sql pandora_console/pandoradb.sql	2024-02-27 17:27:10 +01:00
alejandro.campos@artica.es	c9bde8d90a	Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query	2024-02-23 11:14:17 +01:00
Rafael Ameijeiras	0cce999c95	Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' ... Ent 12695 16818 eliminar warnings en console log See merge request artica/pandorafms!6919	2024-02-22 16:21:32 +00:00
Rafael Ameijeiras	f9b6008296	Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop' ... Ent 12497 usabilidad implementar boton mas operaciones See merge request artica/pandorafms!6955	2024-02-22 16:20:13 +00:00
alejandro.campos@artica.es	195766e11c	minor fixes	2024-02-22 15:05:48 +01:00
alejandro.campos@artica.es	1991b74b9b	Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query	2024-02-21 10:05:11 +01:00
Rafael Ameijeiras	6d3c88efc0	Merge branch 'ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas' into 'develop' ... Ent 12524 giss problemas para abrir elementos en nuevas pestañas vista monitores y alertas See merge request artica/pandorafms!6720	2024-02-21 07:59:15 +00:00
Jonathan	1bdddac95e	#12497 dots agent view	2024-02-20 13:33:36 +01:00
Jonathan	a050c40976	#12524 blank and send parameters on control + click	2024-02-20 08:26:02 +01:00
Jonathan	68ff17ebf4	Merge branch 'develop' into ent-12633-errores-visuales-en-la-funcionalidad-graph-analytics	2024-02-19 12:10:11 +01:00
alejandro.campos@artica.es	df7435132a	change regex search in events	2024-02-16 10:10:38 +01:00
Jonathan	5dd9acb02b	#12524 disable auto start alerts	2024-02-15 13:54:14 +01:00
Jonathan	097f945a7a	Merge branch 'develop' into ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas	2024-02-15 11:44:30 +01:00
Jonathan	e6e98aeb39	Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-15 09:08:25 +01:00
Jonathan	42975c7967	#12695 wip removing warnings	2024-02-14 17:43:20 +01:00
Jonathan	7f580cc388	Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-13 09:42:00 +01:00
Jonathan	0dcced8b53	#12695 wip removing warnings	2024-02-12 17:59:27 +01:00
miguel angel rasteu	301ca0f710	#12866 Fix Other OS name and version in Agent view	2024-02-12 09:42:20 +01:00
daniel	851b046add	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-02-12 08:05:36 +01:00
Jonathan	d590961e69	#12695 wip removing warnings	2024-02-09 13:51:56 +01:00
Rafael Ameijeiras	140ed1c304	Merge branch 'ent-12321-widget-mapa-gis' into 'develop' ... Ent 12321 widget mapa gis See merge request artica/pandorafms!6835	2024-02-09 09:23:42 +00:00
Rafael Ameijeiras	4cdea9d8ef	Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' ... Ent 12460 Cientos de errores en el log de apache See merge request artica/pandorafms!6748	2024-02-09 09:22:48 +00:00
Jonathan	6e1fb2f061	#12695 wip removing warnings	2024-02-08 17:17:17 +01:00
Daniel Maya	8524e7ba31	Merge branch 'develop' into ent-12321-widget-mapa-gis	2024-02-08 09:34:32 +01:00
Jonathan	2246fd8049	#12695 WIP warnings	2024-02-07 16:39:33 +01:00
Jonathan	834635a487	Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-07 10:39:47 +01:00
Jonathan	499ea9b805	#12633 fix visuals errors	2024-02-07 09:21:42 +01:00
daniel	8cfb04d243	new api 2.0	2024-02-07 08:53:54 +01:00
daniel	80b9fc9af1	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-01-31 14:22:59 +01:00
Diego Muñoz-Reja	1980b36c17	Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop' ... Ent 11165 Añadir info de whois de una IP dada en Netflow explorer See merge request artica/pandorafms!6827	2024-01-31 09:14:44 +00:00
Daniel Cebrian	d4ceb1ac4d	Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache	2024-01-30 17:11:30 +01:00
Daniel Cebrian	f68615cba0	#12460 fixed deprecated	2024-01-30 17:00:38 +01:00
daniel	10ee8f572a	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-01-30 16:27:58 +01:00
Daniel Cebrian	5b7a123086	Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache	2024-01-30 13:21:44 +01:00
Daniel Cebrian	4971c29819	#12789 fixed pagination in events	2024-01-30 09:25:17 +01:00
Daniel Cebrian	61e38865f6	Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal	2024-01-30 08:53:04 +01:00
daniel	df1d2675ed	Merge remote-tracking branch 'origin' into ent-12019-api-2-0	2024-01-30 08:13:47 +01:00
Daniel Cebrian	1738a06cf2	#12789 added tip in regex search	2024-01-29 13:42:09 +01:00
Diego Muñoz-Reja	eba2f45ed1	Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop' ... fix filter bug See merge request artica/pandorafms!6761	2024-01-29 12:39:42 +00:00
Daniel Cebrian	f01902903c	#12789 fixed regex in event table	2024-01-29 13:38:29 +01:00
Rafael Ameijeiras	ccaa25da23	Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop' ... Ent 12657 mostrar show entries de eventos de menor a mayor See merge request artica/pandorafms!6785	2024-01-29 09:30:55 +00:00
Alejandro Campos	618f677906	Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' ... # Conflicts: # pandora_console/include/functions_events.php # pandora_console/operation/events/events.php	2024-01-26 13:42:59 +00:00
Jonathan	c07ecff571	#12807 check id_agent for alert view	2024-01-26 08:13:10 +01:00
daniel	f1e3328f37	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 ... Conflicts: pandora_console/include/constants.php	2024-01-25 15:46:40 +01:00
daniel	375c2879f6	new api 2.0	2024-01-25 15:44:50 +01:00
Rafael Ameijeiras	e19f520eb0	Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' ... Ent 12522 Mejoras en audit log See merge request artica/pandorafms!6816	2024-01-25 14:00:56 +00:00
Daniel Cebrian	fbb5d349a2	Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache	2024-01-24 11:58:00 +01:00
Rafael Ameijeiras	b019abbb97	Merge branch 'ent-12782-vista-de-eventos-se-ve-feo-la-paginacion-en-una-pantalla-de-1300px-de-ancho' into 'develop' ... Ent 12782 Vista de eventos: se ve feo la paginacion en una pantalla de 1300px de ancho See merge request artica/pandorafms!6871	2024-01-23 15:44:49 +00:00
Diego Muñoz-Reja	43cb4878cc	Merge branch 'ent-12518-campo-personalizado-de-enlace-web-desde-agente-software-codifica-mal-al-guardar-en-base-de-datos' into 'develop' ... Ent 12518 campo personalizado de enlace web desde agente software codifica mal al guardar en base de datos See merge request artica/pandorafms!6732	2024-01-23 11:28:59 +00:00
Matias Didier	eba0ce9e80	Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop' ... Ent 12624 cambio estilo de ventanas modales See merge request artica/pandorafms!6826	2024-01-23 09:44:21 +00:00
Rafael Ameijeiras	30f6e9ea36	Merge branch 'ent-12539-mostrar-dialogo-con-retardo-de-cierre-en-vista-ppal-de-agente' into 'develop' ... Ent 12539 mostrar dialogo con retardo de cierre en vista ppal de agente See merge request artica/pandorafms!6807	2024-01-23 07:27:34 +00:00
Rafael Ameijeiras	b14825b2b3	Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop' ... Ent 12734 perdida de agente al actualizar gis map See merge request artica/pandorafms!6839	2024-01-23 07:21:50 +00:00
Daniel Cebrian	17056e4ac3	#12460 merge with 12643	2024-01-22 15:30:46 +01:00
Daniel Cebrian	d504267460	Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache	2024-01-22 15:18:01 +01:00
Daniel Cebrian	54e3f94d62	#12782 fixed button sound events style in events	2024-01-22 15:07:25 +01:00
Matias Didier	b38d50a3b2	Merge branch 'ent-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop' ... Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos See merge request artica/pandorafms!6787	2024-01-22 09:30:08 +00:00
Matias Didier	1664764fb1	Merge branch 'ent-12439-16595-lista-del-buscador-no-marca-agentes-silenciosos' into 'develop' ... Ent 12439 16595 lista del buscador no marca agentes silenciosos See merge request artica/pandorafms!6678	2024-01-19 11:16:51 +00:00
Daniel Rodriguez	cc33e5413a	Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop' ... Ent 12202 eastern egg asteroids See merge request artica/pandorafms!6693	2024-01-19 11:10:55 +00:00
Rafael Ameijeiras	6e9a367d05	Merge branch 'ent-12677-corregir-timezone-en-eventos' into 'develop' ... fix timezone events pandora_enterprise#12677 See merge request artica/pandorafms!6796	2024-01-19 08:38:39 +00:00
Diego Muñoz-Reja	5ade3a9e82	Merge branch 'ent-12541-fallos-en-graph-analytics' into 'develop' ... Ent 12541 Fallos en graph analytics See merge request artica/pandorafms!6714	2024-01-18 16:00:08 +00:00
Rafael Ameijeiras	d98c264640	Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop' ... Ent 11900 16100 contador de items en distintas vistas See merge request artica/pandorafms!6792	2024-01-18 12:53:43 +00:00
Rafael Ameijeiras	8517594017	Merge branch 'ent-12727-16867-error-en-busqueda-con-espacios-en-775' into 'develop' ... Ent 12727 16867 error en busqueda con espacios en 775 See merge request artica/pandorafms!6838	2024-01-18 11:19:50 +00:00
Jonathan	4ce970eab1	#12539 fix dialog	2024-01-18 11:26:38 +01:00
Daniel Cebrian	bb2d908de7	#12460 fixed deprecated log	2024-01-17 12:25:57 +01:00
Jonathan	49784cab5a	Merge branch 'develop' into ent-12202-eastern-egg-asteroids	2024-01-17 09:29:21 +01:00
Daniel Maya	034b9805cc	#12734 Fixed visible	2024-01-10 11:17:46 +01:00
Jonathan	f42a0de0ed	#12727 fix search agents	2024-01-10 08:53:49 +01:00
Daniel Maya	e2471f817d	#12321 Added widget Gis map	2024-01-09 14:38:44 +01:00
Jonathan	c862946813	Merge branch 'develop' into ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor	2024-01-09 09:25:22 +01:00
Daniel Maya	b80bfa2799	#12624 change of style in dialog 2	2024-01-04 15:39:27 +01:00
Daniel Cebrian	3287ab2ee4	#11165 new popup for command whois in netflow	2024-01-03 17:06:20 +01:00
Daniel Cebrian	70f213811e	#12716 fixed permission in monitor detail	2024-01-02 11:18:53 +01:00
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