19098 Commits

Author	SHA1	Message	Date
Matias Didier	b3d098794d	Merge branch 'ent-10660-update-journal-usar-las-opciones-de-visual-styles' into 'develop' ... Ent 10660 update journal usar las opciones de visual styles See merge request artica/pandorafms!5798	2023-07-03 11:50:06 +00:00
Matias Didier	daec53aac1	Merge branch 'ent-11191-no-funciona-la-opcion-de-agregar-usuarios-a-las-notificaciones' into 'develop' ... Ent 11191 no funciona la opcion de agregar usuarios a las notificaciones See merge request artica/pandorafms!5901	2023-07-03 09:30:57 +00:00
Jonathan	389365ebd6	Merge branch 'develop' into ent-9756-anadir-escalado-de-estados-a-op-masivas	2023-07-03 11:20:59 +02:00
Gorka Sanchez	7170dc5d1e	Merge branch 'ent-11670-15842-problemas-con-idioma-en-espanol-y-la-seleccion-la-pagina-de-incicio' into 'develop' ... Ent 11670 15842 problemas con idioma en espanol y la seleccion la pagina de incicio See merge request artica/pandorafms!6189	2023-07-03 09:14:01 +00:00
Jonathan	1c69208a6a	Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola	2023-07-03 10:21:55 +02:00
Jonathan	2e5c7b1163	Merge branch 'develop' into ent-11271-estilos-del-discovery-de-azure-mal	2023-07-03 10:03:07 +02:00
Jonathan	d7a682d48c	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-03 09:50:59 +02:00
Miguel Angel Rasteu	6a161a1af8	Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' ... # Conflicts: # pandora_console/include/functions_inventory.php	2023-07-03 07:44:19 +00:00
Gorka Sanchez	ffc4f04989	Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' ... Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view See merge request artica/pandorafms!6154	2023-07-03 07:42:21 +00:00
Gorka Sanchez	7be57b2b22	Merge branch 'ent-11231-15600-filtrar-por-grupo-padre-no-muestra-resultados-en-remote-components' into 'develop' ... Ent 11231 15600 filtrar por grupo padre no muestra resultados en remote components See merge request artica/pandorafms!5915	2023-07-03 07:41:18 +00:00
Gorka Sanchez	b84525f74f	Merge branch 'ent-11267-15611-intervalo-inverso-no-funciona-en-la-creacion-de-modulos-a-traves-de-componentes-de-red' into 'develop' ... Ent 11267 15611 intervalo inverso no funciona en la creacion de modulos a traves de componentes de red See merge request artica/pandorafms!5961	2023-07-03 07:40:10 +00:00
Gorka Sanchez	64edf8bb66	Merge branch 'ent-11287-nombres-de-acciones-de-modulos-en-vista-de-agente-al-hacer-hover' into 'develop' ... Ent 11287 nombres de acciones de modulos en vista de agente al hacer hover See merge request artica/pandorafms!5950	2023-07-03 07:39:23 +00:00
Gorka Sanchez	029cb77068	Merge branch 'ent-11460-top-n-events-by-agent-y-by-module-en-metaconsola-no-toman-en-cuenta-los-top-n-de-los-nodos' into 'develop' ... Ent 11460 top n events by agent y by module en metaconsola no toman en cuenta los top n de los nodos See merge request artica/pandorafms!6036	2023-07-03 07:37:28 +00:00
Jonathan	5f8c2f1653	#11628 merge conflict solution	2023-07-03 09:34:04 +02:00
Gorka Sanchez	498a6d1ee6	Merge branch 'ent-11465-widget-agent-module-view-se-rompe-si-aloja-modulo-no-inicializado-que-posteriormente-reporta' into 'develop' ... Ent 11465 widget agent module view se rompe si aloja modulo no inicializado que posteriormente reporta See merge request artica/pandorafms!6030	2023-07-03 07:33:54 +00:00
artica	74c4b28fc5	Auto-updated build strings.	2023-07-03 01:00:41 +02:00
artica	1d3f1b38fa	Auto-updated build strings.	2023-07-02 01:00:46 +02:00
artica	a2faf2cd58	Auto-updated build strings.	2023-07-01 01:02:08 +02:00
Jorge Rincon	996f54ac30	#11684 Fixed automatic login functionality with loginhash	2023-06-30 14:06:46 +02:00
Gorka Sanchez	b072a8970e	Merge branch 'ent-11671-tactical-view-numeros-de-los-modulos-no-tienen-el-color-de-su-estado' into 'develop' ... Ent 11671 tactical view numeros de los modulos no tienen el color de su estado See merge request artica/pandorafms!6193	2023-06-30 11:44:53 +00:00
Gorka Sanchez	aa7186512c	Merge branch 'ent-9610-filtrar-por-os-en-bulk-operations' into 'develop' ... Ent 9610 filtrar por os en bulk operations See merge request artica/pandorafms!5863	2023-06-30 11:43:50 +00:00
Gorka Sanchez	5e31ca7c65	Merge branch 'ent-10860-problema-con-borrado-de-modulos-hijos-nietos-etc' into 'develop' ... Ent 10860 problema con borrado de modulos hijos nietos etc See merge request artica/pandorafms!5815	2023-06-30 11:42:51 +00:00
Gorka Sanchez	28f99d2c27	Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop' ... Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres See merge request artica/pandorafms!5713	2023-06-30 11:39:50 +00:00
Gorka Sanchez	fe81f0f2f9	Merge branch 'ent-10304-14986-configuracion-masiva-de-la-accion-de-alerta-en-la-politica' into 'develop' ... Ent 10304 14986 configuracion masiva de la accion de alerta en la politica See merge request artica/pandorafms!6195	2023-06-30 11:38:37 +00:00
Rafael Ameijeiras	b44bd8efca	Merge branch 'ent-10691-mejoras-en-widget-top-n-agent-modules' into 'develop' ... Ent 10691 mejoras en widget top n agent modules See merge request artica/pandorafms!5853	2023-06-30 07:06:46 +00:00
Rafael Ameijeiras	2092cfed71	Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop' ... Draft: Ent 11648 Envío de correos falla si se tiene la encriptación de contraseñas habilitadas en 771-772. See merge request artica/pandorafms!6177	2023-06-30 07:05:44 +00:00
artica	3569cc53a4	Auto-updated build strings.	2023-06-30 01:00:59 +02:00
Matias Didier	3b6391102e	Merge branch 'ent-9781-14477-Control-reportes-SQL-Query-en-PDF' into 'develop' ... Ent 9781 14477 control reportes sql query en pdf See merge request artica/pandorafms!5820	2023-06-29 12:49:52 +00:00
Matias Didier	ddbeb008b9	Merge branch 'ent-9267-giss-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual' into 'develop' ... Ent 9267 giss 12115 anadir ruta completa en nombre de servicio en consola visual See merge request artica/pandorafms!5821	2023-06-29 11:55:51 +00:00
miguel angel rasteu	61ab82d808	#10304 Fix action default in agent detail	2023-06-29 12:59:32 +02:00
alejandro.campos@artica.es	087c0c18cc	Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF	2023-06-29 12:00:44 +02:00
Rafael Ameijeiras	d082687c44	Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' ... Ent 10020 eliminar login hash de vistas metaconsola See merge request artica/pandorafms!5839	2023-06-29 09:55:53 +00:00
Rafael Ameijeiras	3c87f090d5	Merge branch 'ent-9928-Entrecomillar-campos-en-exportacion-CSV-para-la-vista-de-eventos' into 'develop' ... wrap csv fields with string delimiter on export See merge request artica/pandorafms!5854	2023-06-29 09:49:29 +00:00
Gorka Sanchez	c660d8c936	Merge branch 'ent-11025-15460-filtro-incorrecto-en-seccion-plantillas-de-alerta-en-metaconsola' into 'develop' ... Ent 11025 15460 filtro incorrecto en seccion plantillas de alerta en metaconsola See merge request artica/pandorafms!6192	2023-06-29 08:54:59 +00:00
Gorka Sanchez	47b46456b3	Merge branch 'ent-10729-15255-15647-Numero-de-Agentes-en-Tactical-View-de-Metaconsola-incorrecto-cuando-los-Agentes-tienen-Grupos-Secundarios' into 'develop' ... fix count See merge request artica/pandorafms!6191	2023-06-29 08:38:06 +00:00
Rafael Ameijeiras	f5f86c9fa2	Merge branch 'ma2sim-develop-patch-81134' into 'develop' ... Change return value of function agents_get_agent_id_by_alias when alias is '' See merge request artica/pandorafms!5498	2023-06-29 08:35:28 +00:00
miguel angel rasteu	487b6673d1	#11671 Fix color in tactical view	2023-06-29 08:09:06 +02:00
artica	a50038f359	Auto-updated build strings.	2023-06-29 01:00:54 +02:00
alejandro.campos@artica.es	029425256d	minor change	2023-06-28 20:53:29 +02:00
Jorge Rincon	9a20ea1231	#11025 Fixed the bug that cuts the text of the Search field	2023-06-28 17:21:06 +02:00
alejandro.campos@artica.es	25fb4ebcac	fix count	2023-06-28 16:43:14 +02:00
miguel angel rasteu	2e110fb162	#11670 Fix home page	2023-06-28 15:08:09 +02:00
Matias Didier	8e42ee6c82	Merge branch 'ent-11262-15597-modulos-deshabiitados-aparecen-en-el-widget-del-dashboard-de-reportes' into 'develop' ... Ent 11262 15597 modulos deshabiitados aparecen en el widget del dashboard de reportes See merge request artica/pandorafms!5966	2023-06-28 12:05:03 +00:00
artica	2e69aa9086	Auto-updated build strings.	2023-06-28 01:01:55 +02:00
Daniel Cebrian	7c99e788c7	#10691 added image no data in pue graph	2023-06-27 15:53:42 +02:00
Daniel Cebrian	70ae1f20e4	#11648 fixed email send with encrypt password	2023-06-27 15:11:18 +02:00
Matias Didier	ac25997f45	Merge branch 'ent-10963-icono-de-reset-erroneo' into 'develop' ... Ent 10963 icono de reset erroneo See merge request artica/pandorafms!5770	2023-06-27 12:16:36 +00:00
Rafael Ameijeiras	d0f33605e0	Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop' ... Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de See merge request artica/pandorafms!5823	2023-06-27 12:07:15 +00:00
Rafael Ameijeiras	7fd836d8de	Merge branch 'ent-11503-campo-comments-ocupa-mucho-para-lo-que-muestra-eventos' into 'develop' ... Ent 11503 campo comments ocupa mucho para lo que muestra eventos See merge request artica/pandorafms!6158	2023-06-27 11:22:44 +00:00
Rafael Ameijeiras	9b1e413fcc	Merge branch 'ent-11560-item-de-inventory-en-informes-funciona-mal-en-meta-y-nodo' into 'develop' ... Ent 11560 item de inventory en informes funciona mal en meta y nodo See merge request artica/pandorafms!6127	2023-06-27 11:21:52 +00:00