Rafael Ameijeiras
|
f2b99cf38e
|
Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha
See merge request artica/pandorafms!6212
|
2023-09-05 07:50:45 +00:00 |
|
Rafael Ameijeiras
|
6e60eeb09b
|
Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop'
Ent 11490 Nuevo widget: group status map
See merge request artica/pandorafms!6252
|
2023-09-04 07:05:49 +00:00 |
Gorka Sanchez
|
6102cb5015
|
Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop'
Ent 11423 nueva herramienta graph analytics
See merge request artica/pandorafms!6327
|
2023-08-31 10:30:27 +00:00 |
Daniel Cebrian
|
dee5667783
|
Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map
|
2023-08-29 10:57:43 +02:00 |
miguel angel rasteu
|
bb3a45050f
|
Merge branch 'develop' into ent-10637-mejora-informe-grupo
|
2023-08-24 12:38:23 +02:00 |
Pablo Aragon
|
670cf7d9a7
|
11423-Graph analytics. Remove graphs & several changes
|
2023-08-24 12:27:06 +02:00 |
Jonathan
|
d9e897568a
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-24 10:06:19 +02:00 |
|
Jonathan
|
ab50a519ea
|
#10639 version 2 datepicker
|
2023-08-24 09:36:15 +02:00 |
|
Pablo Aragon
|
6757e69a75
|
11423-Graph analytics. Resolve Confict
|
2023-08-23 11:55:41 +02:00 |
|
Pablo Aragon
|
c0933e8b15
|
11423-Graph analytics
|
2023-08-23 11:51:29 +02:00 |
|
Rafael Ameijeiras
|
1bca8b0006
|
Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop'
Ent 11819 cambios en wizard de las consolas visuales
See merge request artica/pandorafms!6338
|
2023-08-23 05:54:46 +00:00 |
|
Pablo Aragon
|
bfa09367d4
|
11423-Graph analytics. Share function
|
2023-08-22 15:28:05 +02:00 |
|
miguel angel rasteu
|
feac240905
|
#10637 Resolve conflicts
|
2023-08-22 11:49:23 +02:00 |
|
Pablo Aragon
|
ce1c8cdbb7
|
11423-Graph analytics. Before Share & Export
|
2023-08-22 10:04:33 +02:00 |
|
miguel angel rasteu
|
19fb83cd92
|
#11051 Fix css conflict
|
2023-08-21 13:16:53 +02:00 |
|
miguel angel rasteu
|
6cbb332a8a
|
#10701 Fix css conflict
|
2023-08-21 09:16:22 +02:00 |
|
miguel angel rasteu
|
ebd98b479d
|
#11051 Fix conflict css
|
2023-08-21 09:01:05 +02:00 |
|
miguel angel rasteu
|
970cc997cc
|
#11051 Fix conflict
|
2023-08-21 08:25:53 +02:00 |
|
Rafael Ameijeiras
|
1f9cd3a773
|
Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop'
Ent 11316 Simplificar vistas de soporte
See merge request artica/pandorafms!6173
|
2023-08-21 06:16:41 +00:00 |
Jorge Rincon
|
5e91d8a340
|
Merge branch develop into ent-11315-anadir-filtrado-al-wizard-de-servicios
|
2023-08-18 09:38:05 +02:00 |
|
Daniel Cebrian
|
26a09987c0
|
#11316 fixed modal in black theme and header welcome in header
|
2023-08-18 08:48:33 +02:00 |
|
Daniel Cebrian
|
74ed3d6c2b
|
Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte
|
2023-08-18 08:26:45 +02:00 |
|
Daniel Cebrian
|
5ee4dbee87
|
#11490 added new widget group status map
|
2023-08-16 16:11:35 +02:00 |
|
Pablo Aragon
|
63d3745794
|
11423-Graph analytics. Get filter data (WIP)
|
2023-08-16 15:12:31 +02:00 |
|
Pablo Aragon
|
a10b526938
|
11423-Graph analytics. Get filter data (WIP)
|
2023-08-14 15:36:19 +02:00 |
|
Jonathan
|
53bf10acc0
|
#11819 wizard visual console update
|
2023-08-14 14:54:15 +02:00 |
|
Pablo Aragon
|
5ed9206f36
|
11423-Graph analytics. Drag&Drop (WIP)
|
2023-08-11 13:50:32 +02:00 |
|
Pablo Aragon
|
28b8eeca61
|
11423-Graph analytics (WIP)
|
2023-08-10 09:13:48 +02:00 |
|
Daniel Cebrian
|
06eae47560
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-08-09 13:27:21 +02:00 |
|
Daniel Cebrian
|
496afbc973
|
#11326 reorganized tables
|
2023-08-08 08:46:56 +02:00 |
|
Jonathan
|
774ab78a5b
|
#11836 fix style pandora.css fonts
|
2023-08-04 13:24:23 +02:00 |
|
Rafael Ameijeiras
|
3cfa60b38a
|
Merge branch 'ent-11219-fallo-en-traducciones' into 'develop'
Ent 11219 fallo en traducciones
See merge request artica/pandorafms!6305
|
2023-08-04 09:38:01 +00:00 |
|
Rafael Ameijeiras
|
019efcb124
|
Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop'
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro
See merge request artica/pandorafms!6182
|
2023-08-04 06:45:42 +00:00 |
|
Rafael Ameijeiras
|
b2821c0db3
|
Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola
See merge request artica/pandorafms!6249
|
2023-08-04 06:34:35 +00:00 |
|
miguel angel rasteu
|
c2cdbcce1b
|
#11668 Fix black theme
|
2023-08-03 13:45:31 +02:00 |
|
miguel angel rasteu
|
1009404bfd
|
Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro
|
2023-08-03 13:42:49 +02:00 |
|
miguel angel rasteu
|
135c6835bd
|
#11713 fix title buttons
|
2023-08-03 12:51:09 +02:00 |
|
miguel angel rasteu
|
1dc24cdfb4
|
#11668 Fix black theme
|
2023-08-03 12:22:20 +02:00 |
|
miguel angel rasteu
|
2ced051f56
|
#11668 Fix modal
|
2023-08-03 09:43:06 +02:00 |
|
miguel angel rasteu
|
fddc709aee
|
#11219 Fix transaltes
|
2023-08-02 14:48:02 +02:00 |
|
Rafael Ameijeiras
|
b23397ef82
|
Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop'
Ent 11707 iconos de modulos en tree view estan pegados al texto
See merge request artica/pandorafms!6229
|
2023-08-02 11:43:31 +00:00 |
|
Rafael Ameijeiras
|
d96977b883
|
Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop'
Ent 10562 nueva vista de detalle de alertas encoladas
See merge request artica/pandorafms!6273
|
2023-08-02 08:26:50 +00:00 |
|
Rafael Ameijeiras
|
b052711c92
|
Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop'
Draft: Ent 11697 arreglar menu sin click to display
See merge request artica/pandorafms!6230
|
2023-08-01 12:32:37 +00:00 |
|
Jonathan
|
3b38824ca7
|
#11697 arrow left menu collapse
|
2023-08-01 13:06:43 +02:00 |
|
Jonathan
|
f2328407b1
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-01 09:39:56 +02:00 |
|
Rafael Ameijeiras
|
75b311ad97
|
Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop'
Ent 11768 texto del modal de save filter se muestra mal
See merge request artica/pandorafms!6287
|
2023-07-31 13:10:53 +00:00 |
|
miguel angel rasteu
|
1937c3fa00
|
#11713 Fix style
|
2023-07-31 10:06:12 +02:00 |
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
Daniel Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02:00 |