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

6094 Commits

Author SHA1 Message Date
Guillermo Bonet b6ee1ac2bc Merge branch 'master' into test 2024-09-16 07:17:12 +02:00
Guillermo Bonet fd3b09f6f0 Merge pull request 'feat: refs #7644 Icon' (!713) from 7644-updateInPrint into master 
Reviewed-on: verdnatura/salix-front#713
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-16 05:11:36 +00:00
Javier Segarra 93488a5750 fix: styles 2024-09-13 23:19:16 +02:00
Javier Segarra b6cce74449 fix: merge conflicts 2024-09-13 23:11:18 +02:00
Javier Segarra 401400bdcf fix: remove FetchData 2024-09-13 22:52:26 +02:00
Javier Segarra ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations 2024-09-13 22:50:13 +02:00
Javier Segarra 8ce082d841 Merge pull request '#7671 - Improve/FIX ItemFixedPrice' (!714) from 7671_dense_itemFixedPrices into dev 
Reviewed-on: verdnatura/salix-front#714
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-13 20:44:29 +00:00
Javier Segarra 9c36a113e1 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-13 20:17:01 +00:00
Javier Segarra 6e6af0af80 perf: improve style 2024-09-13 15:16:40 +02:00
Guillermo Bonet eca34e2c0f feat: refs #7644 Icon 2024-09-13 14:57:33 +02:00
Jon Elias 0f604ea8b5 fix: refs #7500 fixed e2e test 2024-09-13 11:34:45 +02:00
Jorge Penadés 48a5c15b9d feat: refs #7828 create axios instance which no manage errors 2024-09-13 10:54:09 +02:00
Javier Segarra a56dc7aa08 test: fix test 2024-09-13 10:33:08 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Jorge Penadés 58be11df04 chore: refs #7828 fix e2e 2024-09-13 10:13:03 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Jorge Penadés 9d63bd1f02 Merge pull request '#7353 warmfix-fixSearchbar' (!697) from 7353-warmfix-fixSearchbar into test 
Reviewed-on: verdnatura/salix-front#697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 07:22:43 +00:00
Jorge Penadés 46fb7d0c73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-13 09:20:14 +02:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar 2024-09-13 07:19:42 +00:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Jon Elias 770663cc37 Merge pull request 'fix: refs #6346 fix list and create' (!404) from 6346-fixWagonModule into dev 
Reviewed-on: verdnatura/salix-front#404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 06:16:04 +00:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Jon Elias 6c4f5ef915 Merge pull request '#7500 added VnImg in EntryDms' (!565) from 7500_ChangeEntryDms into dev 
Reviewed-on: verdnatura/salix-front#565
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 06:11:32 +00:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-13 06:10:34 +00:00
Alex Moreno 6703511ce9 Merge pull request 'fix: refs #7524 dynamic load' (!709) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#709
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 05:59:29 +00:00
Javier Segarra 67140e4383 Merge pull request '#6943 - Customer module migration bugs' (!705) from 6943_fix_customer_module into dev 
Reviewed-on: verdnatura/salix-front#705
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-13 05:33:51 +00:00
Javier Segarra b36f072b24 Merge branch 'dev' into 6943_fix_customer_module 2024-09-12 21:26:43 +02:00
Javier Segarra aca13d9119 fix: CustomerBillingData 2024-09-12 21:26:28 +02:00
Javier Segarra fa408dc226 fix: CustomerAddress mobile 2024-09-12 21:20:30 +02:00
Javier Segarra 6e784bb290 fix: address-create i18n 2024-09-12 21:11:51 +02:00
Javier Segarra 54fc7f6394 fix: CustomerRecovery transalate label 2024-09-12 21:10:06 +02:00
Javier Segarra 39f2deafc4 fix: CustomerCreditOpinion workerDescriptor 2024-09-12 21:08:41 +02:00
Javier Segarra 70d0132710 fix: CustomerWebPayment 2024-09-12 21:03:19 +02:00
Javier Segarra 24f4af712e fix: CustomerMandates 2024-09-12 20:59:35 +02:00
Javier Segarra 8fc7e3cfb4 fix: CustomerSamples 2024-09-12 20:43:50 +02:00
Javier Segarra a29ee42b9e fix: CustomerBasicData show id assigned 2024-09-12 20:41:50 +02:00
Jorge Penadés 5907fedcd6 fix: refs #7524 test 2024-09-12 17:49:59 +02:00
Jorge Penadés 6adcaff5d8 fix: refs #7524 dynamic load 2024-09-12 16:48:39 +02:00
Alex Moreno dcb8c5daad fix: workerDms filter workerFk 2024-09-12 13:27:28 +02:00
Javier Segarra cfdfc7f531 fix: CustomerSamples 2024-09-12 13:19:37 +02:00
Jorge Penadés 44fd356d63 feat: refs #7828 useAcl & cherry pick mail data worker 2024-09-12 13:19:31 +02:00
Jorge Penadés adb9cac360 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-12 13:11:11 +02:00
Javier Segarra ea37015ec2 Merge pull request '#5938 - Use filter grouped by id' (!706) from 5938_filterGrouped into dev 
Reviewed-on: verdnatura/salix-front#706
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-12 11:05:25 +00:00
Jon Elias b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:34:55 +02:00
Jon Elias d00a88a3f4 refactor: refs #7500 deleted useless code 2024-09-12 12:34:54 +02:00
Jon Elias be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-12 10:32:47 +00:00
Jon Elias 35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:31:03 +02:00
Jon Elias e5056c45c0 fix: refs #7500 fixed showing images wrongly 2024-09-12 12:31:00 +02:00
Javier Segarra 058039fd61 Merge branch 'dev' into 5938_filterGrouped 2024-09-12 10:27:36 +00:00