Rafael Ameijeiras
|
3dd082c60f
|
Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop'
Ent 12647 Salto de linea en nombre de evento
See merge request artica/pandorafms!6777
|
2023-12-18 07:52:31 +00:00 |
|
Daniel Maya
|
e6981fb436
|
#12456 Fixed os text style
|
2023-12-15 12:59:56 +01:00 |
|
Daniel Cebrian
|
8df792f11b
|
#12571 custom graphs refactored
|
2023-12-15 10:41:21 +01:00 |
|
Daniel Rodriguez
|
3fe41179e0
|
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline
See merge request artica/pandorafms!6740
|
2023-12-15 09:22:10 +00:00 |
|
Daniel Cebrian
|
67ffe8627b
|
#12647 fixed line break in event list
|
2023-12-14 19:08:34 +01:00 |
|
daniel
|
2890fd3dab
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-14 11:05:29 +01:00 |
|
Jonathan
|
065b096f14
|
#12366 user list 5 users bug styles
|
2023-12-14 10:03:58 +01:00 |
|
Rafael Ameijeiras
|
e71a104e74
|
Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop'
Draft: Ent 12566 Mejoras en visualización de eventos
See merge request artica/pandorafms!6735
|
2023-12-14 08:57:44 +00:00 |
|
Rafael Ameijeiras
|
d5b3bd1c02
|
Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop'
Ent 12483 varios bugs en la vista de campos personalizados
See merge request artica/pandorafms!6689
|
2023-12-14 08:42:02 +00:00 |
|
Jonathan
|
53b56b31af
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-12-14 08:38:52 +01:00 |
|
Daniel Cebrian
|
fed0d92805
|
#12566 fixed colums module_custom_id and event_custom_id length_
|
2023-12-13 19:53:14 +01:00 |
|
Rafael Ameijeiras
|
f4fdacb791
|
Merge branch 'ent-12381-bugs-visuales-al-editar-modulo-en-politicas' into 'develop'
Ent 12381 bugs visuales al editar modulo en politicas
See merge request artica/pandorafms!6637
|
2023-12-13 14:40:32 +00:00 |
|
Jonathan
|
a750e6010d
|
Merge branch 'develop' into ent-12381-bugs-visuales-al-editar-modulo-en-politicas
|
2023-12-13 14:46:36 +01:00 |
|
Matias Didier
|
5d9f50fb05
|
Merge branch 'ent-12270-paginacion-de-widgets-hace-que-me-quepan-en-pantalla' into 'develop'
Ent 12270 paginacion de widgets hace que me quepan en pantalla
See merge request artica/pandorafms!6586
|
2023-12-13 13:29:15 +00:00 |
|
alejandro.campos@artica.es
|
29260473fc
|
fix missing fields
|
2023-12-13 13:29:48 +01:00 |
|
Rafael Ameijeiras
|
a5c5e07565
|
Merge branch 'ent-12065-faltan-opciones-al-abrir-consola-visual-en-la-vista-de-eventos' into 'develop'
Ent 12065 faltan opciones al abrir consola visual en la vista de eventos
See merge request artica/pandorafms!6454
|
2023-12-13 12:19:25 +00:00 |
|
Jonathan
|
88784de3ef
|
#12143 fix datepicker dashboard widget hardening
|
2023-12-13 13:03:08 +01:00 |
|
Jonathan
|
5fa9cd5877
|
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-12-13 11:19:32 +01:00 |
|
daniel
|
cc12c77008
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-13 10:39:48 +01:00 |
|
miguel angel rasteu
|
a3feac4f2e
|
#12065 Resolve conflicts
|
2023-12-13 08:32:12 +01:00 |
|
Jonathan
|
5279bb3e17
|
Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes
|
2023-12-13 08:24:43 +01:00 |
|
Daniel Cebrian
|
1a9bdf97d1
|
#12566 changes in view events
|
2023-12-11 17:01:40 +01:00 |
|
Jonathan
|
28dc5cada0
|
#12596 new dialog on baner open version
|
2023-12-11 12:21:33 +01:00 |
|
daniel
|
a418673489
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-11 11:09:54 +01:00 |
|
Jonathan
|
49fd9435dd
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-12-11 10:13:46 +01:00 |
|
Jonathan
|
78bb8e0bae
|
#8365 ix merge conflict
|
2023-12-07 10:58:45 +01:00 |
|
Jorge Rincon
|
abfa08b6e0
|
#12577 fixed visual error of the dynamic threshold ff threshold and cron from module containers
|
2023-12-07 10:25:11 +01:00 |
|
alejandro.campos@artica.es
|
457f8e9448
|
some changes in discovery
|
2023-12-05 16:07:14 +01:00 |
|
alejandro.campos@artica.es
|
60137eb300
|
changes in discovery extensions
|
2023-12-05 11:32:19 +01:00 |
|
miguel angel rasteu
|
6455314f0c
|
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
|
2023-12-05 11:16:42 +01:00 |
|
daniel
|
77cf0ce6ca
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-05 08:02:55 +01:00 |
|
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 |
|
Jonathan
|
1fb98d34ae
|
#12296 fix conflict merge develop
|
2023-12-01 11:59:03 +01:00 |
|
Jonathan
|
e2eaf6e01e
|
#12381 fix conflict merge develop
|
2023-12-01 11:22:15 +01:00 |
|
miguel angel rasteu
|
41b92cc55f
|
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
|
2023-12-01 10:34:43 +01: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 |
|
Daniel Maya
|
6154ce725b
|
#12501 Fixed password field
|
2023-11-30 13:18:44 +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 |
|
Jonathan
|
b99c9240de
|
#8365 NCM Merge conflict
|
2023-11-30 08:32:15 +01:00 |
|
Daniel Maya
|
0d285802b1
|
#12520 Fixed form
|
2023-11-29 15:32:46 +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 |
|
miguel angel rasteu
|
d096f3f9ea
|
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
|
2023-11-29 08:44:08 +01:00 |
|
Daniel Cebrian
|
4d1df2dcc5
|
#12247 refactored vulnerabilities and hardening
|
2023-11-28 16:59:04 +01:00 |
|
Jonathan
|
837f1ff73c
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 13:04:13 +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 |
|