Commit Graph

2511 Commits

Author SHA1 Message Date
Rafael Ameijeiras 38672764a3 Merge branch 'ent-12341-agent-basic-options' into 'develop'
Ent 12341 agent basic options

See merge request artica/pandorafms!6681
2023-12-04 08:12:23 +00:00
Rafael Ameijeiras fdb58daf2d Merge branch 'ent-12247-vistas-tacticas-de-seguridad-fase-2-vulnerabilidades-y-hardening' into 'develop'
Ent 12247 Vistas tácticas de seguridad fase 2 (vulnerabilidades y hardening)

See merge request artica/pandorafms!6707
2023-12-04 08:11:03 +00:00
miguel angel rasteu ec8d16e49b #11652 Resolve conflicts 2023-12-01 10:07:41 +01:00
Daniel Maya e4b369c769 Merge branch 'develop' into ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894 2023-11-30 13:30:29 +01:00
Matias Didier 8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
2023-11-30 11:41:30 +00:00
Jonathan 1fc2c432e5 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-30 09:14:35 +01:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop'
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
2023-11-29 14:26:53 +00:00
Daniel Cebrian 4d1df2dcc5 #12247 refactored vulnerabilities and hardening 2023-11-28 16:59:04 +01:00
Jonathan 30fd521cb7 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-28 09:32:59 +01:00
Matias Didier 44aff84d9e Merge branch 'ent-11699-filtro-paradas-planificadas-con-fondo-blanco-en-black-theme-en-v772lts' into 'develop'
Ent 11699 filtro paradas planificadas con fondo blanco en black theme en v772lts

See merge request artica/pandorafms!6253
2023-11-28 08:22:29 +00:00
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
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 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
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
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 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 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 081e0c5482 Merge branch 'ent-12271-ventana-informativa-de-configuracion-de-widget-esta-pocha' into 'develop'
Ent 12271 ventana informativa de configuracion de widget esta pocha

See merge request artica/pandorafms!6583
2023-11-27 11:56:32 +00:00
Rafael Ameijeiras 47a0c8e956 Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop'
Ent 11442 consejos de bienvenida tienen controles confusos

See merge request artica/pandorafms!6414
2023-11-27 10:47:18 +00:00
Rafael Ameijeiras ad8e3ac44f Merge branch 'ent-11436-envio-de-correo-electronico-con-advertencia-a-pesar-de-ya-haber-cambiado-la-configuracion' into 'develop'
Ent 11436 envio de correo electronico con advertencia a pesar de ya haber cambiado la configuracion

See merge request artica/pandorafms!6464
2023-11-27 10:40:19 +00:00
Rafael Ameijeiras 368155fa99 Merge branch 'ent-11077-arreglar-espaciado-en-la-informacion-de-modulos-widget-tree-view' into 'develop'
Ent 11077 arreglar espaciado en la informacion de modulos widget tree view

See merge request artica/pandorafms!6390
2023-11-27 10:34:31 +00:00
Rafael Ameijeiras 48c459e768 Merge branch 'ent-12251-integracion-de-los-datos-de-seguridad-en-la-vista-ppal-de-agente' into 'develop'
Ent 12251 Integracion de los datos de seguridad en la vista ppal de agente

See merge request artica/pandorafms!6657
2023-11-27 10:30:43 +00:00
Matias Didier 174a22379e Merge branch 'ent-11995-zoom-en-graficas-rompe-la-grafica' into 'develop'
Ent 11995 zoom en graficas rompe la grafica

See merge request artica/pandorafms!6423
2023-11-27 10:22:07 +00:00
Daniel Maya 6e67dc81ac 12495 Fixed buttons 2023-11-24 09:36:51 +01:00
daniel b497e573fe fix modal events sound bottom bar pandora_enterprise#12378 2023-11-23 14:18:29 +01:00
Jonathan d1b2bf1ee2 Merge branch 'develop' into ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para 2023-11-20 14:33:49 +01:00
miguel angel rasteu 89be9af98f #11442 Fix conflicts 2023-11-17 12:33:33 +01:00
Jonathan 817f0ea021 #12341 WIP basic options agent 2023-11-16 14:07:38 +01:00
miguel angel rasteu 8b9d52646c Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente 2023-11-16 08:06:20 +01:00
Daniel Cebrian 636f76258e #12249 fixed black theme view 2023-11-14 10:12:48 +01:00
Daniel Cebrian 9f3e09ac10 Merge branch 'develop' into ent-12249-vista-de-seguridad-por-agentes 2023-11-13 15:06:28 +01:00
Ramon Novoa 8ec1432414 Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner 2023-11-10 09:53:17 +01:00
Rafael Ameijeiras 72ebccd981 Merge branch 'ent-12322-errores-en-los-menus-de-paginacion-de-operating-systems-y-alert-details' into 'develop'
Ent 12322 errores en los menus de paginacion de operating systems y alert details

See merge request artica/pandorafms!6642
2023-11-10 08:49:54 +00:00
Daniel Cebrian 9fe85f3425 Merge branch 'develop' into ent-12249-vista-de-seguridad-por-agentes 2023-11-08 16:16:40 +01:00
Matias Didier ca8d0ed7f8 Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
Ent 12376 Problemas vistos en la nueva vista táctica

See merge request artica/pandorafms!6628
2023-11-08 13:36:10 +00:00
Jonathan fac64ef190 #12322 datatables length black color 2023-11-08 14:10:49 +01:00
Daniel Cebrian 65524d0ee9 Merge branch 'ent-12252-vista-tactica-de-seguridad-vulnerabilidades' into ent-12249-vista-de-seguridad-por-agentes 2023-11-07 16:56:07 +01:00
Daniel Cebrian 8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01:00
Jonathan 3674fd9880 Merge branch 'develop' into ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar 2023-11-07 09:38:50 +01:00
Jonathan 5cc31e26db #12268 add tooltip redirect message 2023-11-07 09:38:40 +01:00
daniel 718cf41098 Fix btn csv datatables pandora_enterprise#12370 2023-11-03 12:16:54 +01:00
Daniel Maya 287b983ce9 #12371 Fixed events 2023-11-02 15:39:55 +01:00
miguel angel rasteu 88f1b964e3 Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente 2023-11-02 15:22:57 +01:00
miguel angel rasteu 3822ffc0f0 #12137 Fix agent view 2023-11-02 15:22:49 +01:00
miguel angel rasteu 47aeb3cc39 #12137 Fix Description 2023-11-02 13:22:42 +01:00
Jonathan ed5fdfddf5 #12271 styles widget message dashboard 2023-11-02 13:04:59 +01:00
Jonathan b368f3b370 #12271 styles widget message dashboard 2023-11-02 12:33:07 +01:00
Jonathan 0e61cb243b Merge branch 'develop' into ent-12271-ventana-informativa-de-configuracion-de-widget-esta-pocha 2023-11-02 11:46:37 +01:00