William Buezas
|
f8031734fa
|
resolve conflicts
|
2023-12-05 12:27:53 -03:00 |
William Buezas
|
e64960d234
|
Extra community
|
2023-12-05 12:25:25 -03:00 |
Carlos Fonseca
|
66de3c73d3
|
Merge pull request 'Se cambia visualmente el componente que controla las descargas' (#25) from features/ms_39_rediseño_check_descargas into dev
Reviewed-on: hyervoni/salix-front-mindshore#25
|
2023-12-04 18:19:02 +00:00 |
carlosfonseca
|
ce72b52e88
|
Reubicacion de textos i18n a global
|
2023-12-04 12:54:40 -05:00 |
carlosfonseca
|
9f3fe3665b
|
Se cambia visualmente el componente que controla las descargas
|
2023-12-04 12:02:47 -05:00 |
William Buezas
|
9b6ec56011
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-23-ExtraCommunity
|
2023-12-01 09:42:47 -03:00 |
William Buezas
|
1e3406b5fa
|
remove added vscode settings
|
2023-12-01 09:33:56 -03:00 |
Kevin Martinez
|
f040037f8f
|
Merge pull request 'Implementacion de shelvings' (#23) from feature/shelving into dev
Reviewed-on: hyervoni/salix-front-mindshore#23
|
2023-12-01 11:28:51 +00:00 |
Kevin Martinez
|
f6067a6803
|
Merge branch 'dev' into feature/shelving
|
2023-12-01 08:25:47 -03:00 |
William Buezas
|
cdcdd4c544
|
Merge pull request 'New general improvements' (#24) from feature/new-improvements into dev
Reviewed-on: hyervoni/salix-front-mindshore#24
|
2023-12-01 11:24:55 +00:00 |
William Buezas
|
815231fec9
|
resolve conflict
|
2023-12-01 08:23:06 -03:00 |
William Buezas
|
dc29c51cf4
|
merge with dev
|
2023-12-01 08:17:47 -03:00 |
Kevin Martinez
|
11a029289b
|
Merge branch 'dev' into feature/shelving
|
2023-12-01 08:16:17 -03:00 |
Kevin Martinez
|
8ee4bf89aa
|
Remove repeated ID
|
2023-12-01 08:14:55 -03:00 |
Kevin Martinez
|
cb77b86c59
|
Merge pull request 'Se cambia nombre y se implementa en todos los componentes' (#22) from features/ms_38_cambio_tarjeta into dev
Reviewed-on: hyervoni/salix-front-mindshore#22
|
2023-12-01 11:14:00 +00:00 |
William Buezas
|
f1febef063
|
tab i18n
|
2023-11-30 18:03:58 -03:00 |
William Buezas
|
5bab462aa4
|
New general improvements
|
2023-11-30 17:46:07 -03:00 |
Kevin Martinez
|
b11253ba28
|
Implement shelving filter
|
2023-11-30 17:02:18 -03:00 |
Kevin Martinez
|
8855880306
|
Change shelving directory
|
2023-11-30 15:58:25 -03:00 |
Kevin Martinez
|
524e89319e
|
Implement shelving logs
|
2023-11-30 15:57:54 -03:00 |
carlosfonseca
|
820ebe00af
|
Se cambia nombre y se implementa en todos los componentes
|
2023-11-30 11:37:42 -05:00 |
Kevin Martinez
|
babaf47653
|
Update Form Model component
|
2023-11-30 08:47:40 -03:00 |
Carlos Fonseca
|
cf53245bcf
|
Merge pull request 'Update Wagon List' (#19) from feature/ms-28-wagons into dev
Reviewed-on: hyervoni/salix-front-mindshore#19
|
2023-11-30 10:43:27 +00:00 |
Kevin Martinez
|
be66b0b549
|
Update Wagon forms
|
2023-11-29 23:53:35 -03:00 |
Kevin Martinez
|
78477ef362
|
Update Wagon list
|
2023-11-29 23:23:32 -03:00 |
Kevin Martinez
|
cd30d6184a
|
Merge branch 'dev' into feature/ms-28-wagons
|
2023-11-29 23:11:20 -03:00 |
William Buezas
|
0d86fce3ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev
|
2023-11-29 16:11:06 -03:00 |
William Buezas
|
50d5e38130
|
visual refactors
|
2023-11-29 16:10:44 -03:00 |
Kevin Martinez
|
01517c638b
|
Update Shelving page
|
2023-11-29 15:55:31 -03:00 |
William Buezas
|
3bb4a75df7
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev
|
2023-11-29 14:21:36 -03:00 |
William Buezas
|
db81ab8acf
|
Cambios solicitados
|
2023-11-29 14:21:26 -03:00 |
Carlos Fonseca
|
49dfac3fcb
|
Merge pull request 'Correcciones post PR' (#21) from features/ms_32_correcciones_post_pr_2 into dev
Reviewed-on: hyervoni/salix-front-mindshore#21
|
2023-11-29 16:49:30 +00:00 |
carlosfonseca
|
22cf914dc6
|
Correcciones post PR
|
2023-11-29 11:48:06 -05:00 |
Carlos Fonseca
|
7dabc86e10
|
Merge pull request 'Primeras correcciones' (#20) from features/ms_32_correcciones_post_pr_1 into dev
Reviewed-on: hyervoni/salix-front-mindshore#20
|
2023-11-29 14:29:47 +00:00 |
carlosfonseca
|
9b0d30a776
|
Primeras correcciones
|
2023-11-29 09:28:12 -05:00 |
William Buezas
|
62a806b813
|
WIP
|
2023-11-29 09:07:44 -03:00 |
Kevin Martinez
|
37454b91cb
|
Merge branch 'dev' into feature/ms-28-wagons
|
2023-11-29 08:01:21 -03:00 |
Hernan Yervoni
|
b2edb89118
|
Merge pull request 'Adapt invoices out global form to new design and some improvements' (#18) from feature/ms-33-AdaptGlobalInvoicesForm into dev
Reviewed-on: hyervoni/salix-front-mindshore#18
|
2023-11-29 08:31:04 +00:00 |
Kevin Martinez
|
36028afa37
|
Update Wagon List styles
|
2023-11-28 23:06:30 -03:00 |
William Buezas
|
fb1fb9ba64
|
Adapt invoices out global form to new design and some improvements
|
2023-11-28 16:20:01 -03:00 |
Kevin Martinez
|
ce4f7d79ed
|
Fix MR
|
2023-11-28 12:08:33 -03:00 |
Kevin Martinez
|
008dfd1be8
|
Fix merge conflicts
|
2023-11-28 11:58:42 -03:00 |
Carlos Fonseca
|
2f863791f9
|
Merge pull request 'Se agrega condicion de cardlist2' (#17) from features/ms_32_descargar_csv_4 into dev
Reviewed-on: hyervoni/salix-front-mindshore#17
|
2023-11-28 13:59:21 +00:00 |
carlosfonseca
|
33698f0566
|
Se agrega condicion de cardlist2
|
2023-11-28 08:58:25 -05:00 |
Carlos Fonseca
|
a871d98f1c
|
Merge pull request 'Se agrega condicional para mostrar checkbox' (#16) from features/ms_32_descargar_csv_3 into dev
Reviewed-on: hyervoni/salix-front-mindshore#16
|
2023-11-28 13:53:20 +00:00 |
carlosfonseca
|
f002fd2a98
|
Se agrega condicional para mostrar checkbox
|
2023-11-28 08:51:55 -05:00 |
Carlos Fonseca
|
cc79d699f6
|
Merge pull request 'Add csv download feature and add descriptors' (#15) from feature/ms-29-NegativeBasesDetails into dev
Reviewed-on: hyervoni/salix-front-mindshore#15
|
2023-11-28 13:26:38 +00:00 |
Carlos Fonseca
|
ac39a2d398
|
Merge pull request 'Se mejora logica de descarga csv' (#14) from features/ms_32_descargar_csv_2 into dev
Reviewed-on: hyervoni/salix-front-mindshore#14
|
2023-11-28 13:15:26 +00:00 |
carlosfonseca
|
2d08e55c85
|
Se mejora logica de descarga csv
|
2023-11-28 08:11:32 -05:00 |
William Buezas
|
7646934431
|
Add csv download feature and add descriptors
|
2023-11-28 10:11:24 -03:00 |