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

713 Commits

Author SHA1 Message Date
Jorge Penadés 462be6584a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-09-29 12:55:58 +02:00
Alex Moreno 11305fc4c8 Merge pull request '5673-claim-development & crudModel' (!71) from 5673-claim-development into dev 
Reviewed-on: verdnatura/salix-front#71
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-09-28 07:46:01 +00:00
Jorge Penadés 7ae098d779 ref #5417 fix filters and view 2023-09-27 13:41:50 +02:00
Alex Moreno 149e611ae3 Merge branch 'dev' into 5673-claim-development 2023-09-26 12:59:46 +00:00
Alex Moreno 1637921fab refs #5673 fix: VnSelect update model, feat(claimDevelopment) add reload function 2023-09-25 12:06:49 +02:00
Alex Moreno 685c835d13 refs #5673 fix(crudModel): fix formData watcher and removed useState 2023-09-21 15:04:21 +02:00
Guillermo Bonet 9fad8bf78d Merge branch 'master' into test 2023-09-20 08:12:28 +02:00
Guillermo Bonet b8f329afe1 Merge pull request '5995-improvedExternalCmr' (!88) from 5995-improvedExternalCmr into master 
Reviewed-on: verdnatura/salix-front#88
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-09-20 06:08:21 +00:00
Alex Moreno 52fcbdb689 refs #5673 feat(crudModel): add saveFn prop 2023-09-19 10:21:24 +02:00
Alex Moreno ea8a7de6d2 refs #5673 feat(crudModel): works with null values 2023-09-18 14:56:14 +02:00
Alex Moreno 3a5002b3a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-09-18 10:41:31 +02:00
Guillermo Bonet 394a7f7bb7 Merge branch 'master' into 5995-improvedExternalCmr 2023-09-18 05:17:30 +00:00
Javi Gallego 5e8a2c4121 Merge pull request 'dev' (!95) from dev into test 
Reviewed-on: verdnatura/salix-front#95
 2023-09-14 08:31:32 +00:00
Javi Gallego edc0a013a9 Merge pull request 'test' (!94) from test into dev 
Reviewed-on: verdnatura/salix-front#94
 2023-09-14 08:30:16 +00:00
Javi Gallego f1af3b80bd Merge pull request 'test' (!92) from test into master 
Reviewed-on: verdnatura/salix-front#92
 2023-09-07 07:51:36 +00:00
Javi Gallego d1a88776f2 Merge branch 'master' into test 2023-09-07 09:48:47 +02:00
Jorge Penadés db733e63af Merge pull request '6105-createClaimNotes' (!90) from 6105-createClaimNotes into dev 
Reviewed-on: verdnatura/salix-front#90
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-09-01 13:06:26 +00:00
Jorge Penadés a7cea458a2 ref #6105 fix test 2023-09-01 13:42:53 +02:00
Jorge Penadés 0882c3440d ref #6105 fix dialog 2023-09-01 13:09:30 +02:00
Guillermo Bonet 71c6b865b6 refs #5995 Improved external CMR 2023-09-01 12:11:56 +02:00
Javi Gallego 777e45a0cd Merge pull request 'dev' (!89) from dev into test 
Reviewed-on: verdnatura/salix-front#89
 2023-08-31 09:12:53 +00:00
Guillermo Bonet 6786ac97e4 refs #5995 Improved external CMR 2023-08-30 12:53:18 +02:00
Javi Gallego 7348d36be4 Merge pull request 'refs #6153 test - master' (!86) from test into master 
Reviewed-on: verdnatura/salix-front#86
 2023-08-29 07:48:22 +00:00
Alex Moreno 8bd590447d refs #5673 feat: add toolbar in all cards 2023-08-25 14:17:11 +02:00
Alex Moreno 1f169d31e5 typo 2023-08-25 13:47:56 +02:00
Alex Moreno 94f5deffac Merge branch '5673-claim-development' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 12:56:02 +02:00
Alex Moreno ea346cdca2 refs #5673 test(CrudModel): skip remove test 2023-08-25 12:56:00 +02:00
Alex Moreno edc55f2154 Merge branch 'dev' into 5673-claim-development 2023-08-25 10:52:13 +00:00
Alex Moreno 367141a80d refs #5673 test(CrudModel): add getChanges getDifferences front test 2023-08-25 12:33:38 +02:00
Jorge Penadés 4478c2e37d Merge pull request 'refs #6105 fix notes dialog width' (!85) from 6105-createClaimNotes into dev 
Reviewed-on: verdnatura/salix-front#85
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-25 10:05:44 +00:00
Jorge Penadés d4abba6170 refs #6105 VnAvatar description fixed 2023-08-25 11:48:04 +02:00
Jorge Penadés 3a55429668 refs #6105 fix notes dialog width 2023-08-25 11:09:23 +02:00
Alex Moreno b54dfe7267 refs #5673 fix: unnecessary files 2023-08-25 11:03:15 +02:00
Alex Moreno 6260b7ed5e resf #5673 test(claimDevelopment): front test 2023-08-25 10:56:03 +02:00
Alex Moreno a09b4ff548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 10:48:27 +02:00
Alex Moreno fc4ed81e38 test to dev 2023-08-25 10:46:03 +02:00
Alex Moreno 1b97b92931 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-25 10:45:26 +02:00
Jorge Penadés 337b3d369a Merge pull request 'refs 6105 claimNotes and VnNotes created' (!83) from 6105-createClaimNotes into dev 
Reviewed-on: verdnatura/salix-front#83
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-25 08:43:05 +00:00
Alex Moreno c365682e3c refs #5673 fix: crudModel and finish e2e 2023-08-24 15:05:31 +02:00
Jorge Penadés 75e0f4c7fe refs #6105 spacing card notes 2023-08-24 14:59:11 +02:00
Jorge Penadés 86874b1dc7 Merge branch '6105-createClaimNotes' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes 2023-08-24 14:56:32 +02:00
Jorge Penadés 330db88ccc refs #6105 replaced css by QuasarComponents 2023-08-24 14:56:26 +02:00
Alex Moreno 628f51d6de Merge branch 'dev' into 6105-createClaimNotes 2023-08-24 11:46:44 +00:00
Alex Moreno 169e4863b2 refs #5673 fix: front, e2e, fix: VnSelectFilter 2023-08-23 15:09:03 +02:00
Alex Moreno 50ae75ac17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-23 08:37:49 +02:00
Alex Moreno 98552bcd9e refs #5673 test(CrudModel): front and e2e 2023-08-21 15:14:19 +02:00
Alex Moreno da39243cab Merge pull request 'refs #6082 navBar' (!74) from 6082-refactNavBar into dev 
Reviewed-on: verdnatura/salix-front#74
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-21 10:53:01 +00:00
Alex Moreno 3105f1cef6 Merge branch 'dev' into 6082-refactNavBar 2023-08-21 10:51:26 +00:00
Carlos Satorres 89b01759ba Merge branch '6082-refactNavBar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6082-refactNavBar 2023-08-21 12:50:03 +02:00
Carlos Satorres 36a487a9fc refs #6082 navBar fix mobile 2023-08-21 12:50:01 +02:00