203 Commits

Author	SHA1	Message	Date
Jose Gonzalez	a9c4dd625c	Merge develop branch	2023-01-11 13:46:15 +01:00
Jose Gonzalez	33c9b50ddc	Polishing agent detail view	2023-01-10 14:57:40 +01:00
Jonathan	e55d4f3019	#9787 Alert general Acknowledged recovery	2023-01-05 10:36:14 +01:00
Jose Gonzalez	8421fb49ca	Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones	2023-01-04 15:54:16 +01:00
Daniel Barbero	b4d306b9b1	Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3	2022-12-19 09:38:21 +01:00
Daniel Barbero	a0ddad63b8	Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos ... Conflicts: pandora_console/extras/mr/59.sql	2022-12-13 09:17:39 +01:00
Daniel Barbero	01d14ae3b8	new chart chartjs pandora_enterprise#9554	2022-12-13 09:10:13 +01:00
Rafael Ameijeiras	8a6e3e5e06	Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop' ... add sound events to metaconsole pandora_enterprise#8854 See merge request artica/pandorafms!5246	2022-12-12 14:02:36 +00:00
jose.gonzalez@pandorafms.com	445a8161cf	Merge	2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com	a688182062	Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones	2022-11-22 17:47:02 +01:00
Daniel Rodriguez	de9eb0551b	Merge branch 'ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion' into 'develop' ... fix styles events list dashboards pandora_enterprise#9705 See merge request artica/pandorafms!5220	2022-11-22 14:03:35 +00:00
Daniel Barbero	d1beb5cb2d	fixed filters pandora_enterprise#9864	2022-11-22 11:35:38 +01:00
Daniel Barbero	4118a46b9f	add new filter search events pandora_enterprise#9135	2022-11-18 14:04:54 +01:00
jose.gonzalez@pandorafms.com	f99a7dc511	Adaptations	2022-11-07 14:04:07 +01:00
Daniel Barbero	ccc2e830f4	add sound events to metaconsole pandora_enterprise#8854	2022-11-03 15:12:50 +01:00
Daniel Barbero	33b1c0ab8f	add new filter pandora_enterprise#9135	2022-11-03 12:00:58 +01:00
Daniel Barbero	59f0bba7f3	fix styles events list dashboards pandora_enterprise#9705	2022-10-27 09:07:04 +02:00
jose.gonzalez@pandorafms.com	00de0faac3	Adapted views	2022-10-24 19:55:22 +02:00
Diego Muñoz-Reja	aff8fdb005	Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' ... new group by events for extraid pandora_enterprise#9425 See merge request artica/pandorafms!5147	2022-10-24 15:19:21 +00:00
Daniel Barbero	47a2e01a33	Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya ... Conflicts: pandora_console/extras/mr/58.sql	2022-10-18 07:59:26 +02:00
Diego Muñoz-Reja	4c74f1bee7	Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop' ... fixed response events pandora_enterprise#9423 See merge request artica/pandorafms!5141	2022-10-17 10:49:01 +00:00
Daniel Barbero	a21048c4c5	Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra	2022-10-14 08:11:51 +02:00
Daniel Barbero	8438045cf6	filter recursive groups in events pandora_enterprise#2133	2022-09-29 12:54:46 +02:00
Daniel Barbero	3dea1f3146	filter events multiselector nodes pandora_enterprise#8597	2022-09-29 09:17:37 +02:00
Daniel Barbero	8d8140faa4	add new macros response events pandora_enterprise#9423	2022-09-28 09:30:30 +02:00
Daniel Barbero	9e2c6edfeb	new group by events for extraid pandora_enterprise#9425	2022-09-27 15:08:09 +02:00
Daniel Barbero	fbce8b7533	fixed response events pandora_enterprise#9423	2022-09-27 09:51:37 +02:00
Daniel Barbero	225646cd9d	fixed response events pandora_enterprise#9423	2022-09-23 13:55:01 +02:00
Daniel Maya	53cbb4d3da	#9107 conflict resolved	2022-08-29 10:13:39 +02:00
Daniel Barbero	e11d46ea60	Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado ... Conflicts: pandora_console/include/ajax/events.php	2022-08-01 07:08:00 +02:00
Daniel Barbero Martin	e3e9f86119	not group by event status pandora_enterprise#8043	2022-07-26 10:55:11 +02:00
Daniel Barbero Martin	bdd9612812	fix error custom data show all in tab events pandora_enterprise#9305	2022-07-22 10:13:57 +02:00
Daniel Rodriguez	5d674b76b6	Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' ... new filter search eventspandora_enterprise#8942 See merge request artica/pandorafms!5007	2022-07-21 10:15:49 +00:00
Diego Muñoz-Reja	288e6f3a53	Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop' ... Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados See merge request artica/pandorafms!4993	2022-07-19 13:07:45 +00:00
Daniel Barbero Martin	027f61daff	Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos ... Conflicts: pandora_console/extras/mr/56.sql	2022-07-19 10:18:04 +02:00
Daniel Maya	987678b339	#9107 Fixed filter event	2022-07-15 11:38:46 +02:00
Daniel Barbero Martin	12f73d86fd	new filter search eventspandora_enterprise#8942	2022-07-05 17:02:40 +02:00
Daniel Barbero Martin	033027f360	modal sound events pandora_enterprise#9095	2022-07-04 17:09:30 +02:00
Daniel Barbero Martin	2dc16a2a19	modal sound events pandora_enterprise#9095	2022-07-01 13:08:39 +02:00
Daniel Barbero Martin	e28bfe9f3f	modal sound events pandora_enterprise#9095	2022-06-30 17:17:05 +02:00
Daniel Maya	43b2a3d47e	#9140 Fixed comments	2022-06-29 15:34:09 +02:00
Daniel Barbero Martin	1c051f88bc	Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 ... Conflicts: pandora_console/include/functions_events.php	2022-06-27 16:07:19 +02:00
Daniel Barbero Martin	f89aaabc21	minor fixed events	2022-06-23 18:06:25 +02:00
Daniel Barbero Martin	9d23b9af4a	refactor events meta pandora_enterprise#9086	2022-06-21 11:17:18 +02:00
Daniel Barbero Martin	8e7ed75b3e	refactor events meta pandora_enterprise#9086	2022-06-16 11:31:07 +02:00
Daniel Barbero Martin	8ad6d350af	refactor events meta pandora_enterprise#9086	2022-06-15 13:06:10 +02:00
Daniel Barbero Martin	b82b3c3fb1	refactor events meta pandora_enterprise#9086	2022-06-14 18:47:09 +02:00
Daniel Barbero Martin	5968febd04	Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 ... Conflicts: pandora_console/include/javascript/pandora.js	2022-06-13 17:10:19 +02:00
Daniel Barbero Martin	8dbc860f4a	refactor events meta pandora_enterprise#9086	2022-06-08 17:01:15 +02:00
Daniel Barbero Martin	1cd680a971	Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado ... Conflicts: pandora_console/operation/events/events.php	2022-06-03 09:28:18 +02:00