25244 Commits

Author	SHA1	Message	Date
daniel	36eda00ae6	fix errors in new charts pandora_enterprise#9554	2022-12-21 10:07:18 +01:00
daniel	ae88c33aad	composer static phpchartjs pandora_enterprise#9554	2022-12-20 14:22:13 +01:00
Daniel Barbero	2e48d51714	change version 768-MR60 pandora_enterprise#9554	2022-12-20 12:32:41 +01:00
Daniel Barbero	3e071a7d33	remove phamtomjs pandora_enterprise#9554	2022-12-20 12:23:18 +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
artica	87c8dac3af	Auto-updated build strings.	2022-12-19 01:00:16 +01:00
artica	de5aae51e0	Auto-updated build strings.	2022-12-18 01:00:18 +01:00
artica	acc527dc1a	Auto-updated build strings.	2022-12-17 01:00:20 +01:00
Daniel Barbero	1d01b8257d	WIP pandora_enterprise#9554	2022-12-16 14:28:04 +01:00
Daniel Barbero	445dc8d973	fixed js render	2022-12-16 10:39:12 +01:00
Daniel Barbero	62aea35d7b	fixed js render	2022-12-16 10:38:37 +01:00
artica	48c8f31352	Auto-updated build strings.	2022-12-16 01:00:18 +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
Rafael Ameijeiras	32c07afdf4	Merge branch 'ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api' into 'develop' ... Added ACL to apì get tree agents plugin user and plugin pass See merge request artica/pandorafms!5214	2022-12-15 13:38:29 +00:00
Rafael Ameijeiras	bd509ea4f0	Merge branch 'ent-9780-14458-No-se-ve-informacion-en-tareas-Discovery' into 'develop' ... fix task summary See merge request artica/pandorafms!5313	2022-12-15 13:35:58 +00:00
Luis	0351886e1b	ACL api get tree agents	2022-12-15 12:39:06 +01:00
artica	de946e56e8	Auto-updated build strings.	2022-12-15 01:00:18 +01:00
Luis	7716157b8d	Merge remote-tracking branch 'origin/develop' into ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api	2022-12-14 16:25:36 +01:00
Rafael Ameijeiras	50b7fc7c7a	Merge branch 'ent-9349-14050-authtoken-hash-se-ve-en-treeview-metaconsola' into 'develop' ... Hide meta treeview user hash See merge request artica/pandorafms!5225	2022-12-14 10:48:38 +00:00
artica	37c6a8a67b	Auto-updated build strings.	2022-12-14 01:00:18 +01:00
Diego Muñoz-Reja	eb212e3c8a	Merge branch 'ent-9833-no-funciona-busqueda-general-de-usuarios-en-open' into 'develop' ... Ent 9833 no funciona busqueda general de usuarios en open See merge request artica/pandorafms!5277	2022-12-13 16:16:04 +00:00
Rafael Ameijeiras	f6b4631b50	Merge branch 'ent-9597-derivado-del-trabajo-q-a-765-cambiar-el-puerto-por-defecto-en-la-integracion-con-ehorus' into 'develop' ... Changed eHorus default port See merge request artica/pandorafms!5324	2022-12-13 14:22:47 +00:00
Rafael Ameijeiras	44e22d1675	Merge branch 'ent-9498-14180-perfil-de-usuario-sin-grupo-asignado-en-llamada-por-api' into 'develop' ... Check group and profile exist on api add permission user to group See merge request artica/pandorafms!5223	2022-12-13 14:22:16 +00:00
Alejandro Campos	867e1cc2b3	Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' ... # Conflicts: # pandora_console/extras/mr/60.sql	2022-12-13 11:42:41 +00:00
Rafael Ameijeiras	e510460399	Merge branch 'ent-9983-500-en-operaciones-masivas-767-y-error-php-8' into 'develop' ... Fix alerts bulk operations error 500 See merge request artica/pandorafms!5326	2022-12-13 10:52:02 +00:00
Rafael Ameijeiras	30eac6dc6e	Merge branch 'ent-10000-error-500-en-llamada-api-tree_agents' into 'develop' ... Ent 10000 error 500 en llamada api tree agents See merge request artica/pandorafms!5325	2022-12-13 10:48:15 +00:00
Daniel Barbero	cbc598eb03	fixed minor error pandora_enterprise#9135	2022-12-13 09:30:56 +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	5f91d2b077	new chart chartjs pandora_enterprise#9554	2022-12-13 09:11:29 +01:00
Daniel Barbero	01d14ae3b8	new chart chartjs pandora_enterprise#9554	2022-12-13 09:10:13 +01:00
artica	1ebe09698b	Auto-updated build strings.	2022-12-13 01:00:57 +01:00
Rafael Ameijeiras	884e07d11e	Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop' ... Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos See merge request artica/pandorafms!5251	2022-12-12 22:54:27 +00:00
Rafael Ameijeiras	d3a079765d	Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop' ... add new macro event response group_contact pandora_enterprise#9246 See merge request artica/pandorafms!5240	2022-12-12 22:53:21 +00:00
Calvo	af53d63457	Fix alerts bulk operations error 500	2022-12-12 16:51:37 +01:00
Daniel Maya	198f539901	#10000 Fixed api call tree_agents	2022-12-12 16:39:14 +01:00
Calvo	0eb33032ac	Changed eHorus default port	2022-12-12 16:17:11 +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
Rafael Ameijeiras	44655d7ae3	Merge branch 'ent-9152-Opcion-de-habilitar-modulos-en-grupos-en-la-vista-de-agente' into 'develop' ... add enable modules massive option See merge request artica/pandorafms!5215	2022-12-12 11:57:27 +00:00
Rafael Ameijeiras	bb22bf87a9	Merge branch 'ent-8755-Poder-editar-plugins-de-servidor' into 'develop' ... change update constraints for server plugins See merge request artica/pandorafms!5261	2022-12-12 11:49:39 +00:00
Diego Muñoz-Reja	31919d4d2c	Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop' ... Prepare download control See merge request artica/pandorafms!5276	2022-12-12 08:29:51 +00:00
Rafael Ameijeiras	cedee1a3fa	Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop' ... Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado See merge request artica/pandorafms!5258	2022-12-12 08:21:16 +00:00
Rafael Ameijeiras	f9bb893aae	Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' ... implemented custom field See merge request artica/pandorafms!5271	2022-12-12 08:20:08 +00:00
Rafael Ameijeiras	75be3a0c66	Merge branch 'ent-9508-superposicion-de-texto-en-dashboards' into 'develop' ... Fix dashboard dialog tranlations and search bar size See merge request artica/pandorafms!5314	2022-12-12 08:19:39 +00:00
Rafael Ameijeiras	7ea46174c1	Merge branch 'ent-9496-14178-bug-api-validacion-valores-de-entrada' into 'develop' ... Fix module type validadion on api set create network module See merge request artica/pandorafms!5224	2022-12-12 08:14:08 +00:00
Rafael Ameijeiras	1b3535da58	Merge branch 'ent-9709-crear-el-usuario-admin-como-local-por-defecto' into 'develop' ... Ent 9709 crear el usuario admin como local por defecto See merge request artica/pandorafms!5256	2022-12-12 08:12:42 +00:00
Rafael Ameijeiras	dab898aaa0	Merge branch 'ent-9873-14572-imagenes-personalizadas-en-elementos-servicios-de-consola-visual-desaparecen' into 'develop' ... Ent 9873 14572 imagenes personalizadas en elementos servicios de consola visual desaparecen See merge request artica/pandorafms!5301	2022-12-12 08:10:10 +00:00
Rafael Ameijeiras	bca3cf82c7	Merge branch 'ent-9851-14558-visualizacion-erronea-de-imagenes-en-la-pantalla-de-login' into 'develop' ... Ent 9851 14558 visualizacion erronea de imagenes en la pantalla de login See merge request artica/pandorafms!5292	2022-12-12 08:09:11 +00:00
artica	ccde106851	Auto-updated build strings.	2022-12-12 01:00:47 +01:00
artica	e57b0af2a3	Auto-updated build strings.	2022-12-11 01:00:15 +01:00
artica	bdbd313a0d	Auto-updated build strings.	2022-12-10 01:00:15 +01:00