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

8302 Commits

Author SHA1 Message Date
Carlos Satorres 29b923130f Merge branch 'dev' into 8114-removeAutoAddress 2024-12-04 08:22:58 +00:00
Carlos Satorres 32a17738eb Merge pull request 'fix: fix invoiceOut filter' (!1038) from hotfix-6899invoiceOut into master 
Reviewed-on: verdnatura/salix-front#1038
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-04 08:21:58 +00:00
Carlos Satorres 0da4591da8 Merge branch 'master' into hotfix-6899invoiceOut 2024-12-04 08:20:14 +00:00
Javier Segarra 98b8124577 perf: remove setTimeOut insteaduse requestAnimationFrame 2024-12-04 09:15:02 +01:00
Jon Elias 4276cefd7a feat: requested changes in item module 2024-12-04 09:14:00 +01:00
Javier Segarra b1f42cc7e0 test: fix own test 2024-12-03 15:35:24 +01:00
Javier Segarra dcbb0da8c0 Merge branch 'master' into hotfix_scrollToItem 2024-12-03 14:33:17 +00:00
Javier Segarra 7b39fc5f83 Merge branch 'master' into hotfix_itemFixedPrice 2024-12-03 14:32:14 +00:00
Jorge Penadés 7c71becb64 Merge pull request 'feat: add country filter & fix userParams' (!1040) from hotfix-addCountryFilter into master 
Reviewed-on: verdnatura/salix-front#1040
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-03 14:18:26 +00:00
Jorge Penadés 94c0177f1b feat: mock validations 2024-12-03 14:37:45 +01:00
Alex Moreno b4a4c4a0a4 build: new version 2024-12-03 14:34:01 +01:00
Alex Moreno e35fe20a10 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-03 14:32:21 +01:00
Alex Moreno f045b37b55 Merge pull request '8267-devToTest' (!1036) from 8267-devToTest into test 
Reviewed-on: verdnatura/salix-front#1036
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-03 13:32:09 +00:00
Jorge Penadés 4b1a4adfe3 feat: add country filter & fix userParams 2024-12-03 14:01:17 +01:00
Carlos Satorres 1f80229bc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-12-03 11:54:58 +01:00
Alex Moreno b698098823 fix: hotfix correct path "log" 2024-12-03 11:03:40 +01:00
Carlos Satorres ce83879960 Merge branch 'dev' of https: refs #8114//gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress 2024-12-03 10:33:48 +01:00
Carlos Satorres 2afaa48c25 fix: fix invoiceOut filter 2024-12-03 10:25:33 +01:00
Carlos Satorres d832d958ef Merge pull request 'fix: due date' (!1037) from hotfix-6896OrderTranslat into master 
Reviewed-on: verdnatura/salix-front#1037
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-03 08:37:21 +00:00
Carlos Satorres b536cfe0af fix: due date 2024-12-03 09:35:19 +01:00
Alex Moreno ad3894e6b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest 2024-12-03 08:37:05 +01:00
Alex Moreno a36287d8fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest 2024-12-03 08:31:18 +01:00
Alex Moreno 4bc8c948b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-03 08:29:40 +01:00
Javier Segarra 9ac974a46b Merge branch 'master' into hotfix_itemFixedPrice 2024-12-02 23:03:38 +01:00
Javier Segarra 0ddc8f225c test: #7260 add dataCy 2024-12-02 23:02:35 +01:00
Javier Segarra 4f93d472ac fix: #7260 remove value 2024-12-02 23:02:13 +01:00
Jorge Penadés 154c147aed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-02 17:11:03 +01:00
Jorge Penadés 4d6ee25aeb Merge pull request 'fix: refs #6818 get default prefix on err' (!1034) from 6818-hotfix-getDefaultPrefix into master 
Reviewed-on: verdnatura/salix-front#1034
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-02 15:08:04 +00:00
Jorge Penadés baf76cf633 test: refs #6818 update description 2024-12-02 14:43:58 +01:00
Jorge Penadés 07b2be14ae fix: refs #6818 get default prefix on err 2024-12-02 14:39:55 +01:00
Robert Ferrús fcee9a4351 Merge pull request 'fix: refs #8263 itemTags order' (!1033) from 8263-itemTagsOrder into master 
Reviewed-on: verdnatura/salix-front#1033
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-02 12:57:58 +00:00
Robert Ferrús 7c2933893f Merge branch 'master' into 8263-itemTagsOrder 2024-12-02 12:41:01 +00:00
Javier Segarra 624764ba1d Merge branch 'master' into hotfix_scrollToItem 2024-12-02 12:34:57 +00:00
Javier Segarra 46e4727f68 Merge pull request 'fix: HOTFIX Sage input required' (!1024) from hotfix_required_sage into master 
Reviewed-on: verdnatura/salix-front#1024
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-02 12:34:28 +00:00
Javier Segarra 92cd707ec8 Merge branch 'master' into hotfix_required_sage 2024-12-02 12:33:49 +00:00
Carlos Satorres 1291dc1723 fix: refs #8114 clean 2024-12-02 13:28:13 +01:00
Carlos Satorres 50360523b3 fix: refs #8114 remove logs 2024-12-02 13:26:26 +01:00
Carlos Satorres 48482efe3b fix: refs #8114 fix agencyList 2024-12-02 13:25:07 +01:00
Javier Segarra f3834e92d1 Merge branch 'master' into hotfix_scrollToItem 2024-12-02 12:20:15 +00:00
Robert Ferrús d360200e98 fix: refs #8263 itemTags order 2024-12-02 12:43:18 +01:00
Jorge Penadés a3f14bc39f refactor: drop logic 2024-12-02 12:12:23 +01:00
Jorge Penadés cfa22bbc85 Merge branch 'performance_mixins' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:58:57 +01:00
Jorge Penadés bfa7300651 Merge branch 'dev' into performance_mixins 2024-12-02 10:58:52 +00:00
Jorge Penadés 1710ae718e Merge branch 'performance_mixins' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:58:44 +01:00
Jorge Penadés b00a3d7acf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:55:54 +01:00
Alex Moreno 907bf3cf3b feat(Account & AccountRole): refs #8197 add VnCardMain 2024-12-02 11:39:01 +01:00
Jorge Penadés 1940ea638a Merge pull request 'refactor: refs #6818 check prefix' (!1013) from 6818-hotfix-refactorParsePhone into master 
Reviewed-on: verdnatura/salix-front#1013
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-02 10:22:20 +00:00
Jorge Penadés f6ebc3f10d Merge branch 'master' into 6818-hotfix-refactorParsePhone 2024-12-02 10:20:17 +00:00
Carlos Satorres a4bf89882a Merge pull request 'fix: refs #7304 7304 clean warning' (!838) from 7304-warningCustomerBasicData into dev 
Reviewed-on: verdnatura/salix-front#838
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-02 09:38:37 +00:00
Jorge Penadés c341c06170 fix: refs #6818 test 2024-12-02 10:36:30 +01:00