daniel
|
730cfb30ff
|
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-11-28 08:40:07 +01: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
|
3b2c5237d1
|
Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
Ent 12036 error en el nombre de la copia de un dashboard cualquiera
See merge request artica/pandorafms!6457
|
2023-11-28 07:09:11 +00:00 |
Matias Didier
|
b47b076cf1
|
Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop'
Ent 1205 projection graph se inventa la grafica a veces
See merge request artica/pandorafms!6435
|
2023-11-28 07:08:36 +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 |
Matias Didier
|
64cb2ad912
|
Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop'
Ent 11911 welcome dialog no detecta bien el correo configurado
See merge request artica/pandorafms!6440
|
2023-11-28 07:07:26 +00:00 |
artica
|
8bb4758439
|
Auto-updated build strings.
|
2023-11-28 01:00:28 +01:00 |
Daniel Cebrian
|
dde1146ccb
|
#fixed delete allow ip when edit user
|
2023-11-27 17:54:05 +01:00 |
Diego Muñoz-Reja
|
de370ff05c
|
Merge branch 'ent-12117-Comprobar-archivos-antes-de-actualizar-oum' into 'develop'
oum install checks
See merge request artica/pandorafms!6584
|
2023-11-27 16:48:31 +00: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
|
215c665a9c
|
Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop'
Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta
See merge request artica/pandorafms!6565
|
2023-11-27 14:51:48 +00:00 |
Rafael Ameijeiras
|
4ac9316391
|
Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop'
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas
See merge request artica/pandorafms!6475
|
2023-11-27 14:51:02 +00: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
|
728b9d7e7f
|
Merge branch 'ent-12157-sistema-de-notificaciones-muestra-mensaje-sin-texto-alguno' into 'develop'
Ent 12157 sistema de notificaciones muestra mensaje sin texto alguno
See merge request artica/pandorafms!6561
|
2023-11-27 14:48:49 +00:00 |
Rafael Ameijeiras
|
e3153166c1
|
Merge branch 'ent-11856-view-events-ubicacion-erronea-para-el-tip-del-token-search-in-secondary-groups' into 'develop'
Ent 11856 view events ubicacion erronea para el tip del token search in secondary groups
See merge request artica/pandorafms!6388
|
2023-11-27 14:48:24 +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 |
Rafael Ameijeiras
|
67700a1ea2
|
Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop'
Ent 12083 open inventory widget no carga
See merge request artica/pandorafms!6506
|
2023-11-27 14:46:47 +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
|
6e46875721
|
Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop'
Ent 12208 desplegable styles de widget panel with a message
See merge request artica/pandorafms!6549
|
2023-11-27 14:39:38 +00: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
|
25152e27f8
|
Merge branch 'ent-12082-error-al-copiar-widget-de-inventario' into 'develop'
Ent 12082 error al copiar widget de inventario
See merge request artica/pandorafms!6503
|
2023-11-27 14:38:33 +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
|
f13ba41e4c
|
Merge branch 'ent-12373-API-checker-da-URL-incorrecta' into 'develop'
fix api check url
See merge request artica/pandorafms!6648
|
2023-11-27 14:37:24 +00:00 |
Rafael Ameijeiras
|
4406828cc2
|
Merge branch 'ent-12362-no-se-pueden-anadir-alertas-a-modulos-desde-la-vista-agents-alerts-view' into 'develop'
Fix add alerts pandora_enterprise#12362
See merge request artica/pandorafms!6625
|
2023-11-27 14:37:09 +00:00 |
Rafael Ameijeiras
|
57124c4f26
|
Merge branch 'ent-12363-agent-module-view-las-columnas-se-muestran-mal-al-exportar-a-csv' into 'develop'
Fix csv agent-module pandora_enterprise#12363
See merge request artica/pandorafms!6623
|
2023-11-27 14:36:53 +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 |
Calvo
|
a497ae4369
|
Added function to pretty print json
|
2023-11-27 15:13:34 +01:00 |
Daniel Cebrian
|
0ca7f0eb36
|
Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data
|
2023-11-27 14:55:33 +01:00 |
Daniel Cebrian
|
1d95c47030
|
Merge branch 'develop' into ent-12250-informe-detallado-de-seguridad
|
2023-11-27 14:46:10 +01:00 |
Daniel Cebrian
|
afa6a7d415
|
#12517 allow ip limited to user admin
|
2023-11-27 13:55:08 +01:00 |
Daniel Cebrian
|
09708255aa
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-27 13:34:33 +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
|
9919de1d66
|
Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para
See merge request artica/pandorafms!6392
|
2023-11-27 12:24:45 +00: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
|
b15fc06870
|
Merge branch 'ent-11039-giss-snmp-browser-en-entornos-con-meta-no-funciona' into 'develop'
Ent 11039 [GISS] SNMP Browser en entornos con META no funciona.
See merge request artica/pandorafms!6592
|
2023-11-27 12:06:52 +00:00 |
miguel angel rasteu
|
e967b5820a
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-27 13:06:51 +01:00 |
Rafael Ameijeiras
|
95cf2a2654
|
Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop'
Ent 12268 dashboard widget de eventos no se puede clickar
See merge request artica/pandorafms!6620
|
2023-11-27 12:05:52 +00:00 |
miguel angel rasteu
|
cac31cc482
|
#12137 Resolve conflicts
|
2023-11-27 13:05:43 +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
|
a0e6710344
|
Merge branch 'ent-9761-eliminar-por-completo-a-logstash-de-la-consola-web' into 'develop'
Ent 9761 eliminar por completo a logstash de la consola web
See merge request artica/pandorafms!6570
|
2023-11-27 12:03:50 +00:00 |