Commit Graph

8007 Commits

Author SHA1 Message Date
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
2023-11-29 17:52:26 +00:00
Rafael Ameijeiras 33ca5ab4ab Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer

See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
Matias Didier e7ad23c477 Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop'
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico

See merge request artica/pandorafms!6489
2023-11-29 09:30:08 +00:00
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop'
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
2023-11-29 09:29:43 +00:00
Matias Didier 22969eff6e Merge branch 'ent-11074-para-el-listado-de-plugin-registrados-falta-enlace-web-desde-nodo-registrado-hacia-metaconsola' into 'develop'
Ent 11074 para el listado de plugin registrados falta enlace web desde nodo registrado hacia metaconsola

See merge request artica/pandorafms!6482
2023-11-29 08:09:54 +00:00
Matias Didier 447e788ab3 Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado

See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
Rafael Ameijeiras 8b6a4733cf Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
Ent 12253 Informe de vulnerabilidades

See merge request artica/pandorafms!6686
2023-11-28 11:14:48 +00:00
Matias Didier c8daeda489 Merge branch 'ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor' into 'develop'
Ent 12372 error visual al acceder configuracion avanzada remota del servidor

See merge request artica/pandorafms!6662
2023-11-28 10:01:01 +00:00
Rafael Ameijeiras e5237aafe1 Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop'
Ent 12517 Cambiar nombre al token "Allow all IPs"

See merge request artica/pandorafms!6696
2023-11-28 09:58:44 +00:00
Matias Didier bda55cc3a5 Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop'
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces

See merge request artica/pandorafms!6373
2023-11-28 08:22:37 +00:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
Jonathan 2dec31485a Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer 2023-11-28 08:19:53 +01:00
Matias Didier 4dc84d58e3 Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop'
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo

See merge request artica/pandorafms!6460
2023-11-28 07:12:51 +00:00
Matias Didier 746eb298ea Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden

See merge request artica/pandorafms!6437
2023-11-28 07:07:58 +00:00
Daniel Cebrian dde1146ccb #fixed delete allow ip when edit user 2023-11-27 17:54:05 +01:00
Daniel Rodriguez c7fcf7c168 Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop'
changed behavior of prediction modules creation

See merge request artica/pandorafms!6540
2023-11-27 16:01:57 +00:00
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Jorge Rincon 34f9e0df49 Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico 2023-11-27 15:52:41 +01:00
Rafael Ameijeiras 964321d1bd Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas

See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
Rafael Ameijeiras 41e1593afb Merge branch 'ent-11759-15977-cambios-en-la-eliminacion-de-acciones-en-las-alertas-snmp' into 'develop'
Ent 11759 15977 cambios en la eliminacion de acciones en las alertas snmp

See merge request artica/pandorafms!6387
2023-11-27 14:49:08 +00:00
Rafael Ameijeiras 5825a95eae Merge branch 'ent-11855-bug-custom-graphs-el-icono-graph-container-desaparece' into 'develop'
Ent 11855 bug custom graphs el icono graph container desaparece

See merge request artica/pandorafms!6428
2023-11-27 14:47:55 +00:00
Jorge Rincon 6b385ca260 Merge branch 'develop' into ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor 2023-11-27 15:45:14 +01:00
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
Rafael Ameijeiras 2fa8ed3c9e Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
Ent 12219 error al eliminar perfiles en edicion de usuario

See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
Rafael Ameijeiras 707f85ed7f Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management

See merge request artica/pandorafms!6403
2023-11-27 14:36:38 +00:00
Daniel Cebrian afa6a7d415 #12517 allow ip limited to user admin 2023-11-27 13:55:08 +01:00
Daniel Cebrian 27d78ef049 Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades 2023-11-27 13:29:05 +01:00
Daniel Cebrian 7cd163b01e #12253 new reports 2023-11-27 13:25:52 +01:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
Matias Didier 4e37f309b4 Merge branch 'ent-10807-mejorar-vista-gis-map-builder' into 'develop'
Ent 10807 mejorar vista gis map builder

See merge request artica/pandorafms!6552
2023-11-27 12:24:17 +00:00
Matias Didier 7bc998d230 Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop'
Ent 12206 limitacion cambio de contrasena de usuarios

See merge request artica/pandorafms!6542
2023-11-27 12:12:10 +00:00
miguel angel rasteu 167be52f5f #11714 Resolve conflict 2023-11-27 13:11:38 +01:00
Rafael Ameijeiras 793b6502ab Merge branch 'ent-10529-token-session_timeout-se-desborda-con-valor-9999999999' into 'develop'
Ent 10529 token session timeout se desborda con valor 9999999999

See merge request artica/pandorafms!6425
2023-11-27 12:05:29 +00:00
Rafael Ameijeiras 8865f0394e Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop'
Ent 12218 bug del boton show hide password de usuarios

See merge request artica/pandorafms!6553
2023-11-27 12:00:28 +00:00
Rafael Ameijeiras 6992562178 Merge branch 'ent-12126-al-crear-una-nueva-plantilla-de-alerta-aparece-una-opcion-en-cero-literalmente-en-campo' into 'develop'
Ent 12126 al crear una nueva plantilla de alerta aparece una opcion en cero literalmente en campo

See merge request artica/pandorafms!6500
2023-11-27 11:58:30 +00:00
Rafael Ameijeiras 9a172b3f84 Merge branch 'ent-11898-16094-bug-paginacion-en-custom-fields' into 'develop'
Ent 11898 16094 bug paginacion en custom fields

See merge request artica/pandorafms!6379
2023-11-27 11:57:53 +00:00
Rafael Ameijeiras c3af86414f Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
Ent 11650 aviso emergente no acorde con la nueva interfaz

See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
Rafael Ameijeiras cf65c66c38 Merge branch 'ent-12177-en-gestion-de-versiones-obsolescencia-planeada-al-subir-una-supuesta-imagen-guarda-y-se-va-al' into 'develop'
Ent 12177 en gestion de versiones obsolescencia planeada al subir una supuesta imagen guarda y se va al

See merge request artica/pandorafms!6560
2023-11-27 11:55:29 +00:00
Rafael Ameijeiras 7b4423148e Merge branch 'ent-11655-fe-de-erratas-en-idioma-ingles-por-consola-web' into 'develop'
Ent 11655 fe de erratas en idioma ingles por consola web

See merge request artica/pandorafms!6416
2023-11-27 11:53:17 +00:00
miguel angel rasteu b0125d943e #12138 Resolve conflict 2023-11-27 11:51:00 +01:00
miguel angel rasteu a4cd6d7fe1 #12138 Resolve conflict 2023-11-27 11:43:24 +01:00
Rafael Ameijeiras b58714d769 Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
Added name and master server column to servers view

See merge request artica/pandorafms!6613
2023-11-27 10:41:03 +00:00
Rafael Ameijeiras 6f4d519b32 Merge branch 'ent-12417-grafica-de-umbrales-numericos-en-modulos-alfanumericos' into 'develop'
Ent 12417 grafica de umbrales numericos en modulos alfanumericos

See merge request artica/pandorafms!6646
2023-11-27 10:35:53 +00:00
Rafael Ameijeiras e5df1a5285 Merge branch 'ent-12122-CVE-2023-44088-SQL-Injection-en-Consola-Visual' into 'develop'
Ent 12122 cve 2023 44088 sql injection en consola visual

See merge request artica/pandorafms!6525
2023-11-27 10:26:30 +00:00
Rafael Ameijeiras cd8652f9e6 Merge branch 'ent-12121-cve-2023-41814-xss-en-file-manager' into 'develop'
Ent 12121 cve 2023 41814 xss en file manager

See merge request artica/pandorafms!6499
2023-11-27 10:25:54 +00:00
Matias Didier c321165252 Merge branch 'ent-12298-error-en-almacenamiento-de-datos-de-acciones-de-alerta' into 'develop'
Ent 12298 error en almacenamiento de datos de acciones de alerta

See merge request artica/pandorafms!6597
2023-11-27 10:23:58 +00:00
Jorge Rincon 2c0a88f7da Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple 2023-11-27 09:14:04 +01:00