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

682 Commits

Author SHA1 Message Date
Jorge Penadés 41eccd2885 ref #6104 fix claimNotes test 2023-09-27 14:07:49 +02:00
Jorge Penadés 36a0f36f8a ref #6104 fix conflicts 2023-09-27 14:05:37 +02:00
Jorge Penadés ca28ecdd8e ref #6104 tests created and searchFn fixed 2023-09-26 11:49:57 +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
Jorge Penadés bdf288241b ref #6104 fix package 2023-09-18 14:38:35 +02:00
Jorge Penadés 79fc503a01 ref #6104 recreate vnlog 2023-09-18 14:35:21 +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
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 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
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 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
Jorge Penadés e1816d2f16 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes 2023-08-18 14:41:48 +02:00
Jorge Penadés 9f9a44ee37 refs 6105 VnNotes refactored with quasar classes 2023-08-18 14:34:04 +02:00
Alex Moreno 908243141c refs #6080 fix: remove this. 2023-08-18 14:13:49 +02:00
Alex Moreno 1cdd90ea12 refs #6126 change package version 2023-08-18 14:05:10 +02:00
Alex Moreno afddb8f990 refs #5987 fix button color 2023-08-18 14:03:39 +02:00
Jorge Penadés 4bac67de38 refs 6105 VnNotes and ClaimNotes refactored 2023-08-18 12:12:53 +02:00
Jorge Penadés 97180b8490 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes 2023-08-18 12:07:29 +02:00
Alex Moreno c2b10ba271 Merge pull request '5987-fixCardListActions' (!84) from 5987-fixCardListActions into dev 
Reviewed-on: verdnatura/salix-front#84
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-18 06:58:50 +00:00
Jorge Penadés 746bb8962d refs 5987 workerList test fixed 2023-08-17 15:36:06 +02:00
Jorge Penadés 10efafaad8 refs 5987 cardList css refactored 2023-08-17 14:48:05 +02:00
Jorge Penadés 59f2f1a414 ref 5987 cardLists actions click propagation fixed 2023-08-17 13:38:21 +02:00
Jorge Penadés 822fdb75cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes 2023-08-17 11:46:02 +02:00
Alex Moreno e8775a9585 Merge pull request 'refs 5987 index cards and light mode' (!79) from 5987-redisgnCards into dev 
Reviewed-on: verdnatura/salix-front#79
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-17 08:41:56 +00:00
Alex Moreno 831dcfbf6d Merge branch 'dev' into 5987-redisgnCards 2023-08-17 08:39:50 +00:00
Jorge Penadés e7fe7e1888 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6105-createClaimNotes 2023-08-17 10:34:35 +02:00
Jorge Penadés 76071240d1 refs 5987 var-colors fixed 2023-08-17 10:32:24 +02:00
Alex Moreno ab2e1f4553 refs #5990 fix(ticket_descriptor_summary): client.salePersone null value 2023-08-17 09:07:58 +02:00