28052 Commits

Author	SHA1	Message	Date
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
artica	32a1ed1535	Auto-updated build strings.	2023-07-04 01:00:50 +02:00
Matias Didier	321a048d80	Merge branch 'ent-11162-bugs-visuales-en-vista-de-servicios' into 'develop' ... Ent 11162 bugs visuales en vista de servicios See merge request artica/pandorafms!5876	2023-07-03 15:23:52 +00:00
Félix Suárez	c926349c67	Update copyright years	2023-07-03 09:20:25 -06:00
Gorka Sanchez	60af3f2068	Merge branch 'ent-11589-item-de-histograma-en-pdf-no-se-visualiza-mysql-5-7' into 'develop' ... Ent 11589 Item de histograma en PDF no se visualiza mysql 5.7 See merge request artica/pandorafms!6163	2023-07-03 13:50:40 +00:00
Jonathan	1c7e7e8ee1	#11162 new service icon	2023-07-03 15:12:47 +02:00
Jonathan	8f227233fd	#9478 fix delete mesage and permisions	2023-07-03 14:56:39 +02:00
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
Jonathan	11bc45ff02	#11625 fix style event type icon	2023-07-03 12:13:27 +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
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
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
Jonathan	d7a682d48c	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-03 09:50:59 +02:00
Gorka Sanchez	d7a871ff76	Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' ... Ent 10563 mejoras personalizacion interfaz See merge request artica/pandorafms!6200	2023-07-03 07:49:25 +00: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
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	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
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
Gorka Sanchez	6a8a0e8b6f	Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' ... Ent 11469 selector de modulos comunes en wizard de servicios no anade nada See merge request artica/pandorafms!6047	2023-07-03 07:33:05 +00:00
Gorka Sanchez	51de155193	Merge branch 'ent-11676-GUARDIA-15840-Errores-SQL-al-actualizar-con-el-online' into 'develop' ... minor fix See merge request artica/pandorafms!6187	2023-07-03 07:26:01 +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
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	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
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
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	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	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	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	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
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
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
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
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
Daniel Cebrian	6074103e78	#11660 fixed error 500	2023-06-28 17:03:22 +02:00
alejandro.campos@artica.es	25fb4ebcac	fix count	2023-06-28 16:43:14 +02:00
miguel angel rasteu	9b917e3207	#11670 Fix hhome page index	2023-06-28 15:09:21 +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
Daniel Cebrian	4d58240ce3	#11660 fixed error 500 in bulk operation module	2023-06-28 13:27:25 +02:00
alejandro.campos@artica.es	238481fa4c	minor fix	2023-06-28 13:01:41 +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
alejandro.campos@artica.es	1225c055a1	removed hash in url from agent id link	2023-06-28 09:35:49 +02:00
artica	2e69aa9086	Auto-updated build strings.	2023-06-28 01:01:55 +02:00
alejandro.campos@artica.es	2a6a53ccd5	some fixes	2023-06-27 16:20:30 +02:00
Daniel Cebrian	7c99e788c7	#10691 added image no data in pue graph	2023-06-27 15:53:42 +02:00
Matias Didier	63ee67bdff	Merge branch 'ent-11143-se-descoloca-menu-de-paginas-al-pasar-de-14' into 'develop' ... Ent 11143 se descoloca menu de paginas al pasar de 14 See merge request artica/pandorafms!5902	2023-06-27 13:24:37 +00: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
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	48e29def9b	Merge branch 'ent-10252-errata-en-la-interfaz-de-bases-de-datos-de-nodos-y-metaconsola' into 'develop' ... Ent 10252 errata en la interfaz de bases de datos de nodos y metaconsola See merge request artica/pandorafms!5696	2023-06-27 11:26:37 +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	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
miguel angel rasteu	f934d72af9	#11143 Fix auto width modal	2023-06-27 13:09:57 +02:00
miguel angel rasteu	2842a5d3cd	#11372 fix consolelog	2023-06-27 11:51:45 +02:00
miguel angel rasteu	1df94901f6	#11372 trim long file names	2023-06-27 11:48:45 +02:00
miguel angel rasteu	69c6c328c2	#11657 Fix inventory item sql error	2023-06-27 11:08:29 +02:00
Matias Didier	fc3a0766f8	Merge branch 'ent-11152-parametro-de-filtro-de-monitor-detail-se-desmarca-solo' into 'develop' ... Ent 11152 parametro de filtro de monitor detail se desmarca solo See merge request artica/pandorafms!5886	2023-06-27 08:55:29 +00:00
Matias Didier	43e158011a	Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop' ... Ent 11139 icono de lupa descolocado en alert details See merge request artica/pandorafms!5877	2023-06-27 08:37:39 +00:00
Matias Didier	6b9145eeca	Merge branch 'ent-11342-15659-bug-visual-en-configuartion-events' into 'develop' ... Ent 11342 15659 bug visual en configuartion events See merge request artica/pandorafms!6088	2023-06-27 08:01:10 +00:00
artica	c246788f34	Auto-updated build strings.	2023-06-27 01:01:02 +02:00
miguel angel rasteu	f33e569e7b	#11503 Fix event class	2023-06-26 17:09:38 +02:00
Matias Didier	af33f168b6	Merge branch 'ent-11415-15702-no-existe-editor-html-al-configurar-el-widget-panel-con-un-mensaje' into 'develop' ... Ent 11415 15702 no existe editor html al configurar el widget panel con un mensaje See merge request artica/pandorafms!6003	2023-06-26 14:06:05 +00:00
miguel angel rasteu	7934551ff0	#11415 Fix tinymce editor html	2023-06-26 15:17:45 +02:00
Matias Didier	e1fe10f3e3	Merge branch 'ent-11380-15677-selector-filtro-por-estado-monitor-view-metaconsola' into 'develop' ... Ent 11380 15677 selector filtro por estado monitor view metaconsola See merge request artica/pandorafms!5981	2023-06-26 12:48:46 +00:00
Matias Didier	3bbb0cb233	Merge branch 'ent-11404-15690-ordenar-interfaces-correctamente' into 'develop' ... Ent 11404 15690 ordenar interfaces correctamente See merge request artica/pandorafms!6008	2023-06-26 12:05:29 +00:00
Diego Muñoz-Reja	746c12ff9d	Merge branch 'ent-11640-snmp-browser-no-carga-en-v772' into 'develop' ... Ent 11640 snmp browser no carga en v772 See merge request artica/pandorafms!6164	2023-06-26 09:52:42 +00:00
Diego Muñoz-Reja	7471e0ef24	Merge branch 'ent-11461-aviso-fuera-soporte-mysql-5-y-php-8-0' into 'develop' ... Ent 11461 aviso fuera soporte mysql 5 y php 8 0 See merge request artica/pandorafms!6040	2023-06-26 08:57:11 +00:00