7730 Commits

Author	SHA1	Message	Date
Daniel Rodriguez	84f61c9022	Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' ... Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada See merge request artica/pandorafms!6028	2023-07-27 10:27:55 +00:00
Rafael Ameijeiras	9ce383d2ec	Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' ... Ent 11739 compatibilidad php 8 2 See merge request artica/pandorafms!6286	2023-07-27 09:17:24 +00:00
Daniel Cebrian	2c9f7e026e	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-07-26 15:58:26 +02:00
Daniel Maya	bee65bc575	#11739 Fixed deprecated functions	2023-07-26 14:18:20 +02:00
Daniel Rodriguez	c2d7c10442	Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' ... remove legacy visual console See merge request artica/pandorafms!6140	2023-07-26 11:09:44 +00:00
Rafael Ameijeiras	d046e82208	Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' ... Ent 11644 desaparece selector en bulk operations en nodo centralizado See merge request artica/pandorafms!6168	2023-07-25 11:04:38 +00:00
Rafael Ameijeiras	b4742f9e46	Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop' ... Ent 11698 proteccion en cascada de modulos no se puede configurar See merge request artica/pandorafms!6216	2023-07-25 10:34:53 +00:00
Daniel Rodriguez	4b6be6596e	Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop' ... Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa See merge request artica/pandorafms!5858	2023-07-25 10:02:12 +00:00
Rafael Ameijeiras	391447c307	Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop' ... Ent 11708 error al visualizar el boton de delete en metaconsola en category management See merge request artica/pandorafms!6231	2023-07-25 09:05:16 +00:00
Rafael Ameijeiras	85a3e32c27	Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop' ... show server conf remote edition in at least one server element See merge request artica/pandorafms!6197	2023-07-25 09:03:51 +00:00
Rafael Ameijeiras	7f2918990c	Merge branch 'ent-11360-intervalo-en-1-hora-por-defecto-en-item-de-informe-module-histogram-graph' into 'develop' ... Ent 11360 intervalo en 1 hora por defecto en item de informe module histogram graph See merge request artica/pandorafms!6166	2023-07-25 07:53:48 +00:00
Rafael Ameijeiras	458226e24d	Merge branch 'ent-11754-15970-error-de-paginacion-de-custom_graphs' into 'develop' ... Ent 11754 15970 error de paginacion de custom graphs See merge request artica/pandorafms!6267	2023-07-25 07:52:11 +00:00
alejandro.campos@artica.es	31ec1b8209	Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver	2023-07-24 13:49:28 +02:00
Rafael Ameijeiras	db62d257df	Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop' ... Ent 11716 text area plugin parameters se rompe si no anadimos espacios See merge request artica/pandorafms!6244	2023-07-24 10:52:56 +00:00
Pablo Aragon	ccf124103d	11135-Move js code from ui_print_datatable. Resolve conflict	2023-07-24 10:46:19 +02:00
Pablo Aragon	2a89a494cc	10640-Report task. Resolve conflict	2023-07-24 10:06:43 +02:00
Pablo Aragon	8389169e16	Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa	2023-07-24 08:40:33 +02:00
alejandro.campos@artica.es	7b9170312c	implemented pending alerts list for event server	2023-07-21 11:50:53 +02:00
Daniel Rodriguez	4148074996	Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' ... added setup token See merge request artica/pandorafms!6133	2023-07-21 07:23:33 +00:00
miguel angel rasteu	88ba679875	#11651 Fix console.log	2023-07-20 12:52:36 +02:00
miguel angel rasteu	a4442ce31b	#11651 Fix menu	2023-07-20 10:42:22 +02:00
miguel angel rasteu	9978bbe645	#11754 Add pagination	2023-07-20 09:42:09 +02:00
miguel angel rasteu	80b60eb86f	#11749 Fix agent count	2023-07-20 08:43:51 +02:00
Jorge Rincon	ac23a4c375	#11653 Fixed operation for Agent parent field	2023-07-19 15:48:33 +02:00
miguel angel rasteu	1759dfe4b5	#10603 Custom weekly schedule	2023-07-19 12:07:47 +02:00
daniel	1f1b85561c	Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id	2023-07-19 11:39:06 +02:00
Rafael Ameijeiras	06d3664b2f	Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop' ... Ent 10254 [#15114]Añadir timeout y secondary server a AD See merge request artica/pandorafms!6091	2023-07-18 10:14:29 +00:00
Daniel Cebrian	41a03a7a49	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-07-18 09:27:14 +02:00
Rafael Ameijeiras	9ad7ea0d6f	Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop' ... Ent 11420 botones incorrectos en config remota del servidor See merge request artica/pandorafms!6035	2023-07-17 11:12:17 +00:00
miguel angel rasteu	2e4066973a	#11377 Show all groups	2023-07-17 12:32:47 +02:00
Daniel Maya	c333ffcf0a	#11420 fixed url and added buttons	2023-07-17 08:59:32 +02:00
Rafael Ameijeiras	8d423fa0ad	Merge branch 'ent-2892-6602-borrar-en-descripcion-de-modulo-mensaje-de-que-ha-sido-creado-a-traves-de-plantilla' into 'develop' ... Ent 2892 6602 borrar en descripcion de modulo mensaje de que ha sido creado a traves de plantilla See merge request artica/pandorafms!5791	2023-07-17 06:02:29 +00:00
Rafael Ameijeiras	9cec3e1ba5	Merge branch 'ent-5344-seleccionables-de-pdf-en-open-reports' into 'develop' ... Ent 5344 seleccionables de pdf en open reports See merge request artica/pandorafms!5792	2023-07-17 05:59:15 +00:00
Rafael Ameijeiras	d860d613d6	Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' ... Ent 10598 nuevo wizard de bienvenida See merge request artica/pandorafms!6043	2023-07-17 05:57:29 +00:00
miguel angel rasteu	fd56631ae4	#11713 Fix action button title	2023-07-14 13:07:04 +02:00
Rafael Ameijeiras	9499e50eea	Merge branch 'ent-9686-crear-seccion-de-politicas-dentro-del-agente' into 'develop' ... Ent 9686 crear seccion de politicas dentro del agente See merge request artica/pandorafms!5830	2023-07-14 06:58:00 +00:00
Rafael Ameijeiras	d9b95c08ed	Merge branch 'ent-11719-selector-de-modulos-en-las-alertas-del-agente-no-muestra-los-modulos-del-agente-solo-en-nodo' into 'develop' ... Ent 11719 selector de modulos en las alertas del agente no muestra los modulos del agente solo en nodo See merge request artica/pandorafms!6237	2023-07-13 10:43:46 +00:00
Rafael Ameijeiras	9e3dcbd390	Merge branch 'ent-11331-editar-tarea-de-google-cloud-te-lleva-a-discovery' into 'develop' ... Ent 11331 editar tarea de google cloud te lleva a discovery See merge request artica/pandorafms!5957	2023-07-13 10:43:03 +00:00
Daniel Cebrian	20c225e410	Merge branch 'develop' into ent-9686-crear-seccion-de-politicas-dentro-del-agente	2023-07-13 10:16:52 +02:00
Diego Muñoz-Reja	57058c4f9c	Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop' ... Ent 11266 no se habilita el log de consola en 770 ni 771 See merge request artica/pandorafms!6001	2023-07-13 07:55:47 +00:00
Daniel Cebrian	4f26bc2d51	#9686 fixed pagination in policies manager	2023-07-13 08:56:58 +02:00
Jonathan	ab590f6493	#11716 fix size plugins preview	2023-07-12 16:24:46 +02:00
Jonathan	5ba8b4d1ad	Merge branch 'develop' into ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar	2023-07-12 15:30:55 +02:00
Jonathan	9a32c0c700	#11710 fix pagination alerts node on centraliced	2023-07-12 14:16:35 +02:00
Jonathan	0f1b8fce02	#11719 fix modules create alert	2023-07-12 12:11:50 +02:00
Jonathan	d5335da885	#11687 overflow fix	2023-07-12 12:05:17 +02:00
Jonathan	eada8e0652	#11687 fix errors agents and checks	2023-07-12 11:26:33 +02:00
Diego Muñoz-Reja	a7c0866be0	Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' ... Ent 11293 lista de reportes en metaconsola See merge request artica/pandorafms!5952	2023-07-12 07:16:35 +00:00
Jonathan	8b0c9af7a8	#11687 fix style delete modules	2023-07-12 08:41:30 +02:00
Jonathan	93571d1eb6	#11708 fix delete image category metaconsole	2023-07-11 14:10:55 +02:00
Matias Didier	f5f71531ee	Merge branch 'ent-9756-anadir-escalado-de-estados-a-op-masivas' into 'develop' ... Ent 9756 anadir escalado de estados a op masivas See merge request artica/pandorafms!6079	2023-07-11 10:48:55 +00:00
Jonathan	f734b46a80	#9756 fix warning critical status remove duplicate	2023-07-11 12:21:16 +02:00
Diego Muñoz-Reja	3c3889e343	Merge branch 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' into 'develop' ... Ent 11161 campo innecesario y no solicitado al cambiar contrasena de usuario 3 errores distintos See merge request artica/pandorafms!5887	2023-07-11 07:56:21 +00:00
daniel	d3412a7ad1	add filter events comments pandora_enterprise#11387	2023-07-10 16:26:33 +02:00
Daniel Cebrian	aae86cd7ee	Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs	2023-07-10 16:04:04 +02:00
Daniel Cebrian	f3ee738fcc	Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs	2023-07-10 16:02:02 +02:00
Matias Didier	02f173e39d	Merge branch 'ent-11612-en-alert-templates-se-permite-crear-plantillas-con-nombres-vacios' into 'develop' ... Ent 11612 en alert templates se permite crear plantillas con nombres vacios See merge request artica/pandorafms!6135	2023-07-10 13:07:53 +00:00
Gorka Sanchez	bd9e62540f	Merge branch 'ent-11701-aparicion-de-columnas-raras-en-detalles-de-alertas' into 'develop' ... Ent 11701 aparicion de columnas raras en detalles de alertas See merge request artica/pandorafms!6219	2023-07-10 11:46:54 +00:00
Miguel Angel Rasteu	3001cc90ce	Merge branch 'develop' into 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' ... # Conflicts: # pandora_console/godmode/users/user_management.php	2023-07-10 09:45:11 +00:00
miguel angel rasteu	a215620f2e	#11701 Fix alert view	2023-07-10 11:39:43 +02:00
Diego Muñoz-Reja	d7d5519e29	Merge branch 'ent-11327-14544-limite-de-macros-al-editar-el-plugin-no-permite-anadir-nuevo-parametro' into 'develop' ... Ent 11327 14544 limite de macros al editar el plugin no permite anadir nuevo parametro See merge request artica/pandorafms!6005	2023-07-10 09:36:37 +00:00
Matias Didier	a575c3028f	Merge branch 'ent-11037-modificar-etiqueta' into 'develop' ... Ent 11037 modificar etiqueta See merge request artica/pandorafms!5795	2023-07-07 11:57:33 +00:00
Gorka Sanchez	d58be10fc9	Merge branch 'ent-11437-automatic-logout-mechanism-has-been-disabled' into 'develop' ... Ent 11437 Automatic Logout mechanism has been disabled See merge request artica/pandorafms!6070	2023-07-07 07:23:59 +00:00
Daniel Cebrian	1dedb96314	#11682 fixed special days alert	2023-07-06 16:39:21 +02:00
miguel angel rasteu	d46edcd49d	#11701 Fix alert view	2023-07-06 15:51:15 +02:00
Diego Muñoz-Reja	141c34618e	Merge branch 'ent-11378-editar-modulos-webserver-agrega-2-intros-en-la-caja' into 'develop' ... Ent 11378 editar modulos webserver agrega 2 intros en la caja See merge request artica/pandorafms!6000	2023-07-06 13:37:59 +00:00
Jonathan	ecd8c8c116	#11693 critical and warning inverse module web	2023-07-06 14:13:04 +02:00
Jorge Rincon	6c54a877db	#11698 The modules are added to the select Cascade protection modules in the agent configuration	2023-07-06 12:30:26 +02:00
Daniel Cebrian	496058e144	Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled	2023-07-06 12:12:23 +02:00
Daniel Cebrian	24358b5e95	Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs	2023-07-06 12:07:49 +02:00
Jonathan	3c9a31be1c	#11687 max width tags	2023-07-06 12:05:01 +02:00
Jonathan	35274249e4	#11687 Scroll on tags bulk modules	2023-07-06 12:03:02 +02:00
Jonathan	4ace3b205a	#11687 change ui bulk operations modules	2023-07-06 11:53:52 +02:00
Gorka Sanchez	8fd3ed6650	Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' ... Ent 9478 creacion y edicion directa de alertas desde metaconsola See merge request artica/pandorafms!5806	2023-07-06 09:44:33 +00:00
Gorka Sanchez	74191fb94f	Merge branch 'ent-11695-15900-no-funciona-el-filtro-de-acciones-de-alerta' into 'develop' ... Ent 11695 15900 no funciona el filtro de acciones de alerta See merge request artica/pandorafms!6213	2023-07-06 09:41:59 +00:00
Gorka Sanchez	c97d5ae717	Merge branch 'ent-11626-la-visualizacion-del-detalle-de-una-alerta-no-muestra-bien-las-acciones' into 'develop' ... Ent 11626 la visualizacion del detalle de una alerta no muestra bien las acciones See merge request artica/pandorafms!6149	2023-07-06 09:40:43 +00:00
Gorka Sanchez	38995ce73b	Merge branch 'ent-11091-iconos-con-la-misma-descripcion-extension-manager' into 'develop' ... Ent 11091 iconos con la misma descripcion extension manager See merge request artica/pandorafms!5818	2023-07-06 09:38:35 +00:00
Gorka Sanchez	7ec2d5046e	Merge branch 'ent-11692-15882-no-se-puede-detener-paradas-planificadas' into 'develop' ... Ent 11692 15882 no se puede detener paradas planificadas See merge request artica/pandorafms!6211	2023-07-06 09:35:41 +00:00
Matias Didier	add65eca5d	Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop' ... Ent 9162 10821 modificar columnas widget eventos See merge request artica/pandorafms!5843	2023-07-06 08:35:35 +00:00
Diego Muñoz-Reja	6a8e47bee3	Merge branch 'ent-11447-15719-campos-personalizados-no-van-bien' into 'develop' ... Ent 11447 15719 campos personalizados no van bien See merge request artica/pandorafms!6031	2023-07-05 15:26:17 +00:00
Jonathan	47af436342	#11695 fix search alerts	2023-07-05 14:51:07 +02:00
Jorge Rincon	896ddd1a15	#11692 the option to stop Scheduled Downtime is enabled for the Periodically execution type	2023-07-05 14:07:11 +02:00
Jonathan	a385ff93a3	#9478 creation alerts to nodes on metaconsole	2023-07-04 12:47:04 +02:00
Matias Didier	203446af70	Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop' ... Ent 11475 cambiar copyrights backend agentes See merge request artica/pandorafms!6172	2023-07-04 08:49:14 +00:00
Gorka Sanchez	a4d6f29701	Merge branch 'ent-11383-cuando-se-crea-un-usuario-con-el-autorefresh-activado-este-no-se-habilita-correctamente' into 'develop' ... Ent 11383 cuando se crea un usuario con el autorefresh activado este no se habilita correctamente See merge request artica/pandorafms!5997	2023-07-04 08:40:15 +00:00
Jorge Rincon	d25a5e2b89	#11543 Added login screen changes in white mode	2023-07-03 17:37:01 +02:00
Félix Suárez	c926349c67	Update copyright years	2023-07-03 09:20:25 -06:00
miguel angel rasteu	4ff400f54c	#11022 Add agent usage details	2023-07-03 13:18:50 +02:00
Jonathan	47f54edd64	Merge branch 'develop' into ent-11626-la-visualizacion-del-detalle-de-una-alerta-no-muestra-bien-las-acciones	2023-07-03 11:59:56 +02: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
Matias Didier	9ecaf13473	Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' ... #10563 Fix config enable feedback See merge request artica/pandorafms!6203	2023-07-03 08:47:55 +00:00
miguel angel rasteu	8ad4e8261e	#10563 Fix config enable feedback	2023-07-03 10:22:22 +02: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
Miguel Angel Rasteu	82f6c6c0da	Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz' ... # Conflicts: # pandora_console/godmode/agentes/module_manager.php	2023-07-03 07:45:32 +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	8e5e2e966b	Merge branch 'ent-11370-version-de-snmp-walk-mal-representada-visualmente-en-el-desplegable-de-seleccion' into 'develop' ... Ent 11370 version de snmp walk mal representada visualmente en el desplegable de seleccion See merge request artica/pandorafms!5974	2023-07-03 07:40:37 +00:00
miguel angel rasteu	5f864d53a8	#11051 Add action to mark all notification as read	2023-07-03 09:18:30 +02: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
Matias Didier	0e0dd311e7	Merge branch 'ent-11379-15676-reinicio-de-filtro-os-desde-administracion-de-agentes-al-realziar-una-accion-sobre-el' into 'develop' ... Ent 11379 15676 reinicio de filtro os desde administracion de agentes al realziar una accion sobre el See merge request artica/pandorafms!5983	2023-06-30 10:42:02 +00:00
Rafael Ameijeiras	83f3928495	Merge branch 'ent-11657-error-sql-al-seleccionar-varios-agentes-en-item-de-inventario-informe-metaconsola' into 'develop' ... Ent 11657 error sql al seleccionar varios agentes en item de inventario informe metaconsola See merge request artica/pandorafms!6175	2023-06-30 07:07:35 +00:00
Rafael Ameijeiras	59e5bbbf87	Merge branch 'ent-11662-Errores-en-el-menu-componentes-remotos-locales' into 'develop' ... some fixes See merge request artica/pandorafms!6180	2023-06-30 07:03:31 +00:00
miguel angel rasteu	ac92b5979c	#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality	2023-06-30 08:35:37 +02:00
alejandro.campos@artica.es	29f9b3b0f5	show server conf remote edition in at least one server element	2023-06-29 16:13:47 +02:00
alejandro.campos@artica.es	dfd5b5dd9b	show server conf remote edition in at least one server element	2023-06-29 16:09:25 +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
alejandro.campos@artica.es	ab2803eb22	fix	2023-06-29 12:42:00 +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	9e6595be18	Merge branch 'ent-9867-ips-custom-no-actualizan-al-cambiarlas-en-politica' into 'develop' ... Ent 9867 ips custom no actualizan al cambiarlas en politica See merge request artica/pandorafms!5802	2023-06-29 09:52:09 +00:00
Rafael Ameijeiras	7cbae9d6d5	Merge branch 'ent-11660-errores-en-operaciones-masivas' into 'develop' ... Ent 11660 Errores en operaciones masivas See merge request artica/pandorafms!6183	2023-06-29 09:43:39 +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
Matias Didier	cbd60b0c9e	Merge branch 'ent-9567-derivado-del-trabajo-q-a-765-formulario-para-modificar-alertas-debe-ser-ampliado-en-tamano' into 'develop' ... Ent 9567 derivado del trabajo q a 765 formulario para modificar alertas debe ser ampliado en tamano See merge request artica/pandorafms!5787	2023-06-29 06:55:30 +00:00
Jorge Rincon	9a20ea1231	#11025 Fixed the bug that cuts the text of the Search field	2023-06-28 17:21:06 +02:00
Daniel Cebrian	6074103e78	#11660 fixed error 500	2023-06-28 17:03:22 +02:00
miguel angel rasteu	2e110fb162	#11670 Fix home page	2023-06-28 15:08:09 +02:00
Daniel Cebrian	4d58240ce3	#11660 fixed error 500 in bulk operation module	2023-06-28 13:27:25 +02:00
alejandro.campos@artica.es	2366a89850	fixed error	2023-06-28 12:19:05 +02:00
Matias Didier	3c748d2520	Merge branch 'ent-10144-modo-centralizado-impide-ver-en-que-agentes-se-usan-los-plugins' into 'develop' ... Ent 10144 modo centralizado impide ver en que agentes se usan los plugins See merge request artica/pandorafms!6004	2023-06-28 10:10:48 +00:00
Daniel Cebrian	eac3cf409b	#9771 new input for select mode of interval and changes in database	2023-06-27 17:37:41 +02:00
alejandro.campos@artica.es	2a6a53ccd5	some fixes	2023-06-27 16:20:30 +02:00
Jorge Rincon	3c3c253a51	#11645 Fixed the error message in the SLA items	2023-06-27 16:04:00 +02: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
Matias Didier	5795196380	Merge branch 'ent-11575-bug-en-edicion-de-layer-gis' into 'develop' ... Ent 11575 bug en edicion de layer gis See merge request artica/pandorafms!6148	2023-06-27 11:51:38 +00:00
Rafael Ameijeiras	2eea623912	Merge branch 'ent-10353-#15036-Componentes-con-el-mismo-nombre' into 'develop' ... Ent 10353 #15036 componentes con el mismo nombre See merge request artica/pandorafms!5714	2023-06-27 11:27:40 +00:00
Rafael Ameijeiras	520f0c77d1	Merge branch 'ent-10266-tip-sobre-opcion-de-setup-en-version-opensource-setup-visual-precision-de-datos' into 'develop' ... Ent 10266 tip sobre opcion de setup en version opensource setup visual precision de datos See merge request artica/pandorafms!5703	2023-06-27 11:26:02 +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
miguel angel rasteu	69c6c328c2	#11657 Fix inventory item sql error	2023-06-27 11:08:29 +02:00
Daniel Cebrian	d2413ed461	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-06-26 13:15:09 +02:00
Rafael Ameijeiras	e0650224ca	Merge branch 'ent-11581-item-alert-group-alert-report-no-muestra-nada-en-metaconsola' into 'develop' ... Ent 11581 Item "Alert Group Alert Report" no muestra nada en metaconsola See merge request artica/pandorafms!6113	2023-06-26 07:51:54 +00:00
Rafael Ameijeiras	d37c0f3d79	Merge branch 'ent-11599-item-grouped-group-report-muestra-la-informacion-de-todos-los-nodos-en-metaconsola' into 'develop' ... Ent 11599 Item "Grouped group report" muestra la información de todos los nodos en metaconsola See merge request artica/pandorafms!6126	2023-06-26 07:50:29 +00:00
Rafael Ameijeiras	a3ef14c50b	Merge branch 'ent-11347-15666-mensaje-del-visor-de-tokens-de-api-tiene-mojibake' into 'develop' ... Ent 11347 15666 mensaje del visor de tokens de api tiene mojibake See merge request artica/pandorafms!6084	2023-06-26 07:36:22 +00:00
Rafael Ameijeiras	359ea37a29	Merge branch 'ent-10953-actualizar-estilos-del-editor-de-componentes-locales-editor-de-componentes-remotos-y-editor' into 'develop' ... Ent 10953 actualizar estilos del editor de componentes locales editor de componentes remotos y editor See merge request artica/pandorafms!6029	2023-06-26 07:32:28 +00:00
Rafael Ameijeiras	c5bd2819c3	Merge branch 'ent-11619-al-crear-nuevo-usuario-te-dice-que-estas-editando-el-tuyo' into 'develop' ... Ent 11619 al crear nuevo usuario te dice que estas editando el tuyo See merge request artica/pandorafms!6165	2023-06-26 07:29:39 +00:00
miguel angel rasteu	c65bd468a5	#Fix item inventory 11560	2023-06-26 08:29:19 +02:00
Félix Suárez	cfc34033b6	Replace "Artica Soluciones Tecnol[o,ó]gicas"	2023-06-23 15:14:57 -06:00
Félix Suárez	e17e2ee66c	Replace "Artica Soluciones Tecnol[o,ó]gicas S.L"	2023-06-23 15:08:07 -06:00
Matias Didier	fde3857674	Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' ... Ent 11476 cambiar headers de copyright See merge request artica/pandorafms!6069	2023-06-22 13:24:47 +00:00
Jonathan	b80962cb55	#11644 action buttons select option delete agents	2023-06-22 14:30:54 +02:00
Matias Didier	a0f1dacfae	Merge branch 'ent-10921-about-y-warm-update-cogen-la-version-de-la-consola-de-tokens-ditintos' into 'develop' ... Ent 10921 about y warm update cogen la version de la consola de tokens ditintos See merge request artica/pandorafms!5885	2023-06-22 10:57:24 +00:00
Jonathan	4f51d31f3f	#11360 historigram default 1hour	2023-06-22 11:55:59 +02:00
Matias Didier	1bf4657efa	Merge branch 'ent-11515-elementos-sla-en-informes-se-pueden-crear-sin-limite' into 'develop' ... Ent 11515 elementos sla en informes se pueden crear sin limite See merge request artica/pandorafms!6072	2023-06-22 09:17:54 +00:00
Jorge Rincon	c5ad0309cf	#11619 fixed the error in both node and metaconsole	2023-06-22 10:51:26 +02:00
Matias Didier	e3c8483bd7	Merge branch 'ent-11428-warning-de-que-no-se-pueden-eliminar-agentes-porque-el-nodo-esta-en-modo-centralizado-aparece' into 'develop' ... Ent 11428 warning de que no se pueden eliminar agentes porque el nodo esta en modo centralizado aparece See merge request artica/pandorafms!6058	2023-06-22 08:26:04 +00:00
Jorge Rincon	649955bdf4	#11515 Edit option enabled	2023-06-22 10:09:52 +02:00
Matias Didier	718c4c901b	Merge branch 'ent-11440-no-aparece-el-nombre-de-las-acciones-que-no-son-por-defecto-en-la-vista-detallada-de-las' into 'develop' ... Ent 11440 no aparece el nombre de las acciones que no son por defecto en la vista detallada de las See merge request artica/pandorafms!6063	2023-06-22 07:32:13 +00:00
Diego Muñoz-Reja	6ee3a9134d	Merge branch 'ent-11517-error-columnas-personalizadas-en-la-vista-de-informes' into 'develop' ... Ent 11517 error columnas personalizadas en la vista de informes See merge request artica/pandorafms!6078	2023-06-21 14:21:50 +00:00
Matias Didier	84be6e1d04	Merge branch 'ent-11435-editor-de-campos-de-eventos-muy-pequeno' into 'develop' ... Ent 11435 editor de campos de eventos muy pequeno See merge request artica/pandorafms!6044	2023-06-21 14:06:16 +00:00
Jonathan	bc2bd68689	#11571 text QR	2023-06-21 13:49:34 +02:00