1253 Commits

Author	SHA1	Message	Date
daniel	ff3b7001c3	fixed styles	2023-03-04 13:22:52 +01:00
daniel	95df525cb2	fixed styles	2023-03-03 14:16:06 +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
Alejandro Campos	f297f6fff9	Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' ... # Conflicts: # pandora_console/extras/mr/62.sql # pandora_console/pandoradb.sql	2023-03-02 16:53:42 +00: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	774b32d7a0	fixed styles	2023-03-01 13:54:22 +01:00
daniel	8ac9df14ab	fixed styles	2023-02-28 19:01:37 +01:00
Pablo Aragon	3dbe668973	Events meta	2023-02-28 17:47:49 +01:00
alejandro.campos@artica.es	a1f172e713	several fixes	2023-02-28 17:06:31 +01:00
Pablo Aragon	38a05d2a79	Events meta	2023-02-28 09:50:42 +01:00
daniel	12212fff02	restyling	2023-02-27 13:41:44 +01:00
Pablo Aragon	e024658520	10454-Events	2023-02-27 09:57:17 +01:00
Jose Gonzalez	a6f1037c9a	Minor fixes or improvements	2023-02-24 13:37:47 +01:00
Pablo Aragon	a9d49dea3b	10454-Fix filters	2023-02-24 10:04:23 +01:00
Daniel Cebrian	0990fe672e	#10324 added system fav menu in agent and events	2023-02-23 09:48:13 +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	bbde3e4181	Minor fixes	2023-02-22 12:15:17 +01:00
alejandro.campos@artica.es	b76a4b1a48	fix conflicts	2023-02-22 10:10:14 +01:00
alejandro.campos@artica.es	6c64ccd6d6	implemented consoles management	2023-02-21 15:32:45 +01:00
Daniel Cebrian	35a1a67006	#9073 refactoring	2023-02-17 12:53:35 +01:00
Jonathan	e6eed5e471	fix visual module graph and monitor details more details	2023-02-17 11:54:48 +01:00
Matias Didier	c6f6a6b9d3	Merge branch 'ent-10410-Carga-muy-lenta-de-comentarios-de-eventos-en-tyr-saga' into 'develop' ... fixed comment loading in event dialog See merge request artica/pandorafms!5543	2023-02-16 09:34:35 +00:00
Jose Gonzalez	e42c4575d5	Double authentication active	2023-02-16 07:25:26 +01:00
alejandro.campos@artica.es	5c57954b50	fixed comment loading in event dialog	2023-02-15 19:38:57 +01:00
Jose Gonzalez	1d682521e9	Minor fixes in agent/module view	2023-02-14 10:41:40 +01:00
Daniel Cebrian	e62dee1c62	#9073 create files structure	2023-02-13 10:06:14 +01:00
Jose Gonzalez	d6eedf07aa	Merge	2023-02-13 10:03:09 +01:00
Rafael Ameijeiras	2c619540e0	Merge branch 'ent-10188-13786-arreglar-filtros-de-alertas-sonoras' into 'develop' ... fix filter events sounds pandora_enterprise#10188 See merge request artica/pandorafms!5469	2023-02-10 08:03:34 +00:00
Jose Gonzalez	175d4b7341	Fixes in Event view and other fixes	2023-02-09 16:13:30 +01:00
Pablo Aragon	971fc84a47	9680-Create widget ModulesByStatus	2023-02-09 10:12:59 +01:00
Daniel Cebrian	ea789804f4	#10190 fixed response option	2023-02-07 17:41:27 +01:00
Daniel Cebrian	6117e1741f	#10190 added popup for edit events in sound console	2023-02-07 16:48:23 +01:00
alejandro.campos@artica.es	e4f5a9a61a	Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores	2023-02-01 09:36:42 +01:00
Jose Gonzalez	0363a90e1f	Resolve merge issues	2023-01-31 17:35:44 +01:00
Jonathan	34fede2ce1	#9819 New section configuration sound event	2023-01-27 12:42:23 +01:00
daniel	81ae7fdb08	fix filter events sounds pandora_enterprise#10188	2023-01-27 12:41:06 +01:00
Rafael Ameijeiras	1488504e56	Merge branch 'ent-10175-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop' ... fix validate events pandora_enterprise#10175 See merge request artica/pandorafms!5453	2023-01-26 12:56:20 +00:00
Rafael Ameijeiras	7bdfb1a096	Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' ... Added child module delete warning See merge request artica/pandorafms!5429	2023-01-26 12:53:03 +00:00
Calvo	0458f4357e	Added recursion to delete modules children warning	2023-01-25 18:03:54 +01:00
alejandro.campos@artica.es	ce57a3cc4b	minor change	2023-01-25 17:41:46 +01:00
alejandro.campos@artica.es	902a843765	implemented agents view filter management	2023-01-25 17:22:54 +01:00
daniel	ddebce7a3c	fix validate events pandora_enterprise#10175	2023-01-25 11:25:20 +01:00
Rafael Ameijeiras	9bf789dd26	Merge branch 'ent-10215-mapa-de-calor-pinchar-en-un-elemeno-de-tipo-agente-no-muestra-info' into 'develop' ... Ent 10215 mapa de calor pinchar en un elemeno de tipo agente no muestra info See merge request artica/pandorafms!5443	2023-01-24 12:00:34 +00:00
Calvo	5d0826f412	Delete modules with children message	2023-01-24 12:26:49 +01:00
Rafael Ameijeiras	1d33c0cb69	Merge branch 'ent-10095-14748-ordenar-alertas-por-fecha-en-detalles-de-alerta' into 'develop' ... Ent 10095 14748 ordenar alertas por fecha en detalles de alerta See merge request artica/pandorafms!5409	2023-01-23 15:24:33 +00:00
Daniel Maya	5a4d9739d3	#10215 Fixed open heatmap	2023-01-23 13:58:06 +01:00
alejandro.campos@artica.es	67b7234e58	implement filter save and load feature in monitor view	2023-01-19 10:49:48 +01:00
Jose Gonzalez	8510629781	Treeview improvement	2023-01-19 00:31:11 +01:00
Jonathan	f3cd19c315	#10014 New filters log viewer	2023-01-16 11:34:28 +01:00
Daniel Cebrian	57bac825d2	#10095 fixed order last triggered	2023-01-12 16:44:29 +01:00
Jose Gonzalez	a9c4dd625c	Merge develop branch	2023-01-11 13:46:15 +01:00
Jose Gonzalez	118099cd24	Minor fixes and solve issues with module templates	2023-01-11 13:02:18 +01:00
Jose Gonzalez	33c9b50ddc	Polishing agent detail view	2023-01-10 14:57:40 +01:00
Daniel Cebrian	f37db99337	#9618 deleted hd()	2023-01-10 11:46:14 +01:00
Daniel Cebrian	df87c122af	added ip in modules list	2023-01-10 10:50:47 +01:00
Jose Gonzalez	60685cdccc	Table fixes	2023-01-10 10:18:37 +01:00
Daniel Rodriguez	5d667f4952	Merge branch 'ent-10119-vista-de-alertas-fallo-en-la-version-open' into 'develop' ... Ent 10119 vista de alertas fallo en la version open See merge request artica/pandorafms!5381	2023-01-09 09:26:40 +00:00
Daniel Cebrian	889cd81155	#9999 changed limit length when value is -1	2023-01-05 14:33:04 +01:00
Daniel Cebrian	a1421b9138	#9999 changed value limit in sql filter	2023-01-05 13:47:51 +01:00
Daniel Cebrian	7906c8fe2f	#9999 fixed filter all in alert list	2023-01-05 13:40:59 +01:00
Daniel Maya	b4d54fb729	#10119 Fixed alerts table	2023-01-05 13:31:40 +01:00
Jonathan	e55d4f3019	#9787 Alert general Acknowledged recovery	2023-01-05 10:36:14 +01:00
Jose Gonzalez	f94dc47b64	Minor fix	2023-01-04 16:03:41 +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
Jose Gonzalez	8728551c08	Agent details modules table upgraded	2023-01-04 15:46:32 +01:00
Rafael Ameijeiras	6b4bc8b9b0	Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop' ... Ent 9903 no permitir nombres de perfiles duplicados See merge request artica/pandorafms!5321	2022-12-28 10:01:46 +00:00
Rafael Ameijeiras	1cb7149db3	Merge branch 'ent-10048-bug-mail-to-admin-en-monitoring-alert-details' into 'develop' ... Ent 10048 bug mail to admin en monitoring alert details See merge request artica/pandorafms!5355	2022-12-28 09:58:08 +00:00
Pablo Aragon	fe548936a0	10048 Exclude id_alert_action from query	2022-12-23 10:29:18 +01:00
daniel	47c503bdab	Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3	2022-12-21 12:51:18 +01:00
Rafael Ameijeiras	e642ca29b5	Merge branch 'ent-9922-no-se-puede-filtrar-por-tags-en-la-vista-de-alertas' into 'develop' ... Fix alert list tag filter See merge request artica/pandorafms!5315	2022-12-20 11:25:53 +00:00
Jose Gonzalez	b0997850f4	Fix server type icon definition	2022-12-19 16:38:47 +01:00
Rafael Ameijeiras	b640b9f7b9	Merge branch 'ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard' into 'develop' ... new widget datamatrix pandora_enterprise#8619 See merge request artica/pandorafms!5257	2022-12-19 10:49:45 +00: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
alejandro.campos@artica.es	4ca220a3a7	Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe	2022-12-15 15:28:58 +01:00
Daniel Barbero	eecda4560a	fixed error pagination datamatrix pandora_enterprise#8619	2022-12-13 10:41:38 +01:00
Daniel Barbero	2d638a61cf	Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard	2022-12-13 09:59:30 +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
Jonathan	0b6d1a7840	#9903 Duplicate control profile	2022-12-09 11:37:08 +01:00
Calvo	51e6e5b0a1	Fix alert list tag filter	2022-12-07 11:24:09 +01: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
Daniel Barbero	a31733ffef	Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos	2022-11-18 07:51:26 +01:00
Daniel Barbero	e10455c902	new widget datamatrix pandora_enterprise#8619	2022-11-10 16:10:50 +01:00
Daniel Barbero	f273813869	new widget datamatrix pandora_enterprise#8619	2022-11-10 12:05:25 +01:00
Daniel Barbero	4b4f92b11b	new widget datamatrix pandora_enterprise#8619	2022-11-08 16:30:25 +01:00
Daniel Rodriguez	3417ec9421	Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop' ... fix performance issue See merge request artica/pandorafms!5199	2022-11-07 16:05:58 +00:00
jose.gonzalez@pandorafms.com	f99a7dc511	Adaptations	2022-11-07 14:04:07 +01:00
alejandro.campos@artica.es	514b350e14	fixed performance problems	2022-11-03 18:20:39 +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	94fb25d104	Merge remote-tracking branch 'origin/develop' into ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion	2022-11-02 13:42:13 +01:00
Daniel Barbero	59f0bba7f3	fix styles events list dashboards pandora_enterprise#9705	2022-10-27 09:07:04 +02:00
alejandro.campos@artica.es	8d611a8e7f	implemented float formatting and option in reports to change visualization format	2022-10-26 18:25:16 +02:00
Daniel Barbero	3273fc23ed	Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento ... Conflicts: pandora_console/extras/mr/58.sql	2022-10-26 09:42:02 +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 Rodriguez	a3dc8be0e5	Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop' ... Ent 9254 13891 encriptar contrasenas en replicacion de bbdd See merge request artica/pandorafms!5140	2022-10-21 10:42:16 +00:00
Diego Muñoz-Reja	423d4b8763	Merge branch 'ent-9641-mejorar-heatmaps' into 'develop' ... Ent 9641 mejorar heatmaps See merge request artica/pandorafms!5196	2022-10-21 09:29:40 +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
alejandro.campos@artica.es	08ab924160	fix performance issue	2022-10-17 18:08:48 +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 Maya	f3bae30f55	#9641 heatmap changes	2022-10-14 13:53:05 +02: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	9c93a99fb2	add mode maintenance VC pandora_enterprise#4822	2022-10-13 11:03:49 +02:00
Daniel Barbero	d90005d0f5	Merge remote-tracking branch 'origin/develop' into ent-8597-13156-anadir-opciones-en-busqueda-de-eventos	2022-10-10 16:37:45 +02:00
Daniel Barbero	38dea9e01b	Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra	2022-10-10 11:27:28 +02:00
Daniel Maya	a674bdceb0	#9595 Fixed order	2022-10-03 10:16:00 +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	755432b381	Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo	2022-09-28 08:52:43 +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
Calvo	2a4176085f	Fix alerts meta datatables	2022-09-26 09:22:19 +02:00
Daniel Barbero	225646cd9d	fixed response events pandora_enterprise#9423	2022-09-23 13:55:01 +02:00
Daniel Maya	795308367f	#9254 load password with ajax	2022-09-23 13:24:46 +02:00
Calvo	522607ec40	Fix meta alert datatable order	2022-09-19 14:14:33 +02:00
Calvo	bc5f1d0dce	Fix meta alert datatable order	2022-09-19 14:02:50 +02:00
Calvo	c177ee2e2e	Fix meta alert datatable order	2022-09-16 15:01:52 +02:00
Calvo	56c5f324b0	Fix alerts metaconsole datatable order	2022-09-15 18:01:16 +02:00
Calvo	544497d2ba	Fix alerts list pagination on meta	2022-09-09 13:07:36 +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
Jimmy Olano	33f6ae1875	Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' ... Alerts list datatable Ref: pandora_enterprise#8797 See merge request artica/pandorafms!5018	2022-07-22 02:39:35 +00: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
Calvo	642c60428c	Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola	2022-07-19 09:40:56 +02:00
Calvo	34333f9f88	Alerts list datatable	2022-07-15 12:15:37 +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
Jimmy Olano	efa0640d8c	Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop' ... legend combined graph module view pandora_enterprise#9121 pandora_enterprise#9121 See merge request artica/pandorafms!4986	2022-06-29 22:37:25 +00:00
Diego Muñoz-Reja	bc6f234029	Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' ... Resized alert action list and refactor See merge request artica/pandorafms!4980	2022-06-29 14:50:37 +00:00
Daniel Maya	43b2a3d47e	#9140 Fixed comments	2022-06-29 15:34:09 +02:00
José González	7edcd3b0a6	Improve code and fix update alerts	2022-06-29 11:05:50 +02:00
daniel	4ca27cd5a9	Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' ... events sound pandora_enterprise#7960 See merge request artica/pandorafms!4923	2022-06-28 13:47:05 +00:00
daniel	867e659118	Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' ... add treshold pdf pandora_enterprise#1419 See merge request artica/pandorafms!4894	2022-06-28 13:45:53 +00:00
Daniel Barbero Martin	d969ac42bf	legend combined graph module view pandora_enterprise#8621	2022-06-27 17:09:27 +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