wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
914 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

914 Commits

Author SHA1 Message Date
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
William Buezas f9fe504969 Apply dark/light colors to cards secondary button 2023-12-07 17:20:27 -03:00
William Buezas ec9e8ec4e0 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-12-07 14:54:58 -03:00
William Buezas d91c6ff11f new requested changes 2023-12-07 14:54:53 -03:00
Carlos Fonseca b8d30fa0a4 Merge pull request 'Se corrige error por falta de importacion' (#30) from features/ms_correcciones_pr_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#30
 2023-12-07 17:44:42 +00:00
carlosfonseca 02027d4392 Se corrige error por falta de importacion 2023-12-07 12:43:07 -05:00
Carlos Fonseca 0e624bdfd3 Merge pull request 'Se hacen correcciones segun solicititud para aprobacion del PR' (#29) from features/ms_correcciones_pr into dev 
Reviewed-on: hyervoni/salix-front-mindshore#29
 2023-12-07 17:39:01 +00:00
carlosfonseca c2705ec603 Se hacen correcciones segun solicititud para aprobacion del PR 2023-12-07 12:36:29 -05:00
Kevin Martinez 4fd2b05137 Fix shelving pages 2023-12-07 13:33:11 -04:00
Carlos Fonseca 0dbb23075b Merge pull request 'feature/ms-23-ExtraCommunity' (#26) from feature/ms-23-ExtraCommunity into dev 
Reviewed-on: hyervoni/salix-front-mindshore#26
 2023-12-05 18:48:54 +00:00
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