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

6970 Commits

Author SHA1 Message Date
Alex Moreno e0e03526af Merge pull request 'warmFix: Revert previous commit e57a253c6f649382da187d1129449d265fb26d3b' (!930) from revert_warning_inject into dev 
Reviewed-on: verdnatura/salix-front#930
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 10:28:37 +00:00
Javier Segarra 2bcd7061cb revert e57a253c6f 
revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev

Reviewed-on: verdnatura/salix-front#928
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 09:50:00 +00:00
Javier Segarra e57a253c6f Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev 
Reviewed-on: verdnatura/salix-front#928
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 08:09:09 +00:00
Javier Segarra b0bb09e9a6 perf: refs #7308 #7308 remove comments 2024-11-14 09:03:18 +01:00
Javier Segarra 0fe5f6d54d Merge branch 'dev' into 7308-warning_inject 2024-11-14 07:20:28 +00:00
Javier Segarra 590d495dbd test: refs #7308 #7308 axios.spec.js 2024-11-14 08:19:41 +01:00
Javier Segarra ef415d080a feat: refs #7308 #7308 remove warnings related to useSession 2024-11-14 08:19:19 +01:00
Jon Elias 483760c8cd Merge pull request '#7132 fix translations' (!843) from 7132-FixTranslations into dev 
Reviewed-on: verdnatura/salix-front#843
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 07:10:49 +00:00
Jon Elias f9ef50db02 Merge branch 'dev' into 7132-FixTranslations 2024-11-14 07:10:02 +00:00
Guillermo Bonet c2b6b816a4 fix: refs #7283 Account image resolution 2024-11-14 08:04:06 +01:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-11-13 14:10:08 +01:00
Jorge Penadés 7dba1a1846 Merge pull request 'feat: refs #6818 add icon' (!924) from 6818-addIcon into dev 
Reviewed-on: verdnatura/salix-front#924
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 11:01:40 +00:00
Jorge Penadés 9291c4dd6a feat: refs #6818 add icon 2024-11-13 11:50:08 +01:00
Jorge Penadés d474fb924f Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev 
Reviewed-on: verdnatura/salix-front#904
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 08:25:27 +00:00
Jorge Penadés 96e9de519f Merge branch 'dev' into 6818-saySimpleIntegration 2024-11-13 08:22:44 +00:00
Alex Moreno 1f8ead608c Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev 
Reviewed-on: verdnatura/salix-front#918
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-13 06:48:55 +00:00
Alex Moreno 2ae9d68fec Merge branch 'dev' into warmFix_order_equalSalix 2024-11-13 06:21:59 +00:00
Alex Moreno 8269037faa chore: perf 2024-11-13 07:21:42 +01:00
Jorge Penadés 83be57a0c4 chore: refs #6818 drop useless code & comment 2024-11-12 15:01:17 +01:00
Jorge Penadés e29cd38ae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-12 15:00:18 +01:00
Alex Moreno fc28639556 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-12 14:40:42 +01:00
Alex Moreno 3f15c3cce0 feat(VnSelect): order data equal salix 2024-11-12 14:35:55 +01:00
Jorge Penadés 679107d7ea Merge pull request 'fix: refs #7354 redirect to ticket' (!917) from 7354-hotfix-redirectToTicket into master 
Reviewed-on: verdnatura/salix-front#917
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 12:47:35 +00:00
Jorge Penadés 86b8f9bf54 Merge pull request 'feat: refs #6919 sync entry data' (!913) from 6919-reactiveDescriptor into dev 
Reviewed-on: verdnatura/salix-front#913
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-12 12:37:39 +00:00
Jorge Penadés 90f04cc010 Merge branch 'dev' into 6919-reactiveDescriptor 2024-11-12 12:36:48 +00:00
Jorge Penadés 18f544f8dc fix: refs #7354 redirect to ticket 2024-11-12 13:23:28 +01:00
Javier Segarra 830c3658d4 Merge pull request 'fix/OrderCatalog' (!893) from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev 
Reviewed-on: verdnatura/salix-front#893
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-12 12:01:43 +00:00
Jorge Penadés 1554333e07 Merge pull request 'fix: refs #7354 zip filter' (!916) from 7354-hotfix-zipFilter into master 
Reviewed-on: verdnatura/salix-front#916
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 11:53:41 +00:00
Jorge Penadés db8340bde5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354-hotfix-zipFilter 2024-11-12 12:51:09 +01:00
Alex Moreno 26af102804 fix(CreateThermographForm): remove limit 2024-11-12 12:47:30 +01:00
Jorge Penadés 2afddeb063 fix: refs #7354 zip filter 2024-11-12 12:41:10 +01:00
Javier Segarra a7d53fcbe6 Merge branch 'dev' into fix/OrderCatalog 2024-11-12 11:30:36 +00:00
Javier Segarra a76d63ff00 Merge pull request 'HOTFIX: Send SMS using mobile instead phone' (!914) from hotFix-customer_sms into master 
Reviewed-on: verdnatura/salix-front#914
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-12 11:13:32 +00:00
Javier Segarra 2139b7e8e8 Merge branch 'master' into hotFix-customer_sms 2024-11-12 11:12:46 +00:00
Carlos Satorres d8ae6c056e Merge pull request 'fix: fix termo' (!915) from hotfix-termog into master 
Reviewed-on: verdnatura/salix-front#915
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-12 11:09:41 +00:00
Carlos Satorres fefa61ea5c fix: fix termo 2024-11-12 12:07:02 +01:00
Javier Segarra 6355993c14 fix: mobile is more relevant than phone 2024-11-12 11:00:05 +00:00
Jorge Penadés b4d7653661 refactor: refs #6919 export filter 2024-11-12 11:15:34 +01:00
Jorge Penadés efd66ea02a feat: refs #6919 sync entry data 2024-11-12 11:08:45 +01:00
Alex Moreno 95b6e72e6c Merge pull request 'HOTFIX(CustomerBalance): getClientRisk' (!912) from hotFix_customer_balance into master 
Reviewed-on: verdnatura/salix-front#912
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-12 09:27:54 +00:00
Alex Moreno 700fb7481b fix(CustomerBalance): getClientRisk 2024-11-12 10:15:31 +01:00
Jorge Penadés 81b35aa75b chore: refs #6818 add spaces 2024-11-12 10:11:26 +01:00
Jorge Penadés 700701f055 refactor: refs #6818 channel logic 2024-11-12 10:10:26 +01:00
Jorge Penadés c775ba8592 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-12 09:45:05 +01:00
Jorge Penadés cc12250109 Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev 
Reviewed-on: verdnatura/salix-front#910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 08:35:42 +00:00
Alex Moreno 8c78991163 fix(EntryStockBought): min width 2024-11-12 08:23:49 +01:00
Alex Moreno 87b7fd6db4 Merge pull request '8179-testToMaster' (!909) from 8179-testToMaster into master 
Reviewed-on: verdnatura/salix-front#909
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-11-12 07:01:11 +00:00
Jorge Penadés 7f1a4d6cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-11 16:42:20 +01:00
Jorge Penadés 07e7cbc355 feat: refs #6839 module searching 2024-11-11 16:36:18 +01:00
Alex Moreno e21087e645 Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev 
Reviewed-on: verdnatura/salix-front#906
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-11 12:48:16 +00:00