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

10966 Commits

Author SHA1 Message Date
Pau Rovira c5da27ddff Merge branch 'dev' into 8612-shelvinge2e 2025-02-26 08:39:21 +00:00
Alex Moreno 4593fda04e test: skip workerCreate e2e 2025-02-26 09:37:29 +01:00
Pau Rovira edd3396439 Merge branch 'dev' of https: refs #8612//gitea.verdnatura.es/verdnatura/salix-front into 8612-shelvinge2e 2025-02-26 08:12:06 +01:00
Pau Rovira 71d693e2a4 Merge branch '8612-shelvinge2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8612-shelvinge2e 2025-02-26 08:04:08 +01:00
Pau Rovira 3835d7debe fix: refs #8612 fixed shelving e2e tests 2025-02-26 08:04:04 +01:00
Alex Moreno 6525e8907f refactor: remove unused variables 2025-02-26 07:37:12 +01:00
Alex Moreno 8f77b16953 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-26 07:32:12 +01:00
Pau Rovira 7ab161b7f1 Merge pull request 'fix: #8593 fixed parking e2e tests' (!1392) from 8593-parkingTestsE2e into dev 
Reviewed-on: verdnatura/salix-front#1392
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-26 06:30:33 +00:00
Pau Rovira d2b5ebfa6a Merge branch 'dev' into 8593-parkingTestsE2e 2025-02-26 06:16:22 +00:00
Pau Rovira 287d4a6686 Merge branch 'dev' into 8612-shelvinge2e 2025-02-26 05:59:22 +00:00
Javier Segarra 5372742d51 Merge pull request 'warmfix: #7451 descriptorProxy dataKey' (!1496) from warmfix_descriptorProxy_dataKey into test 
Reviewed-on: verdnatura/salix-front#1496
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-25 13:07:50 +00:00
Javier Segarra c41a999f9b Merge branch 'test' into warmfix_descriptorProxy_dataKey 2025-02-25 13:06:51 +00:00
Carlos Satorres ef85c2cfa2 Merge pull request 'fix: workerBasicData' (!1484) from warmfix-workerBasicDataFix into test 
Reviewed-on: verdnatura/salix-front#1484
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-25 13:02:20 +00:00
Javier Segarra 4910970ffe Merge branch 'test' into warmfix_descriptorProxy_dataKey 2025-02-25 12:59:30 +00:00
Carlos Satorres cbdae5de52 Merge branch 'test' into warmfix-workerBasicDataFix 2025-02-25 12:58:51 +00:00
Javier Segarra df62ccee8b feat: detect when is descriptor proxy 2025-02-25 13:50:07 +01:00
Javier Segarra e4e57127a0 fix: add datakey 2025-02-25 13:49:54 +01:00
Alex Moreno a69e697edb refactor: remove default browser setting from Cypress configuration 2025-02-25 12:53:49 +01:00
Alex Moreno 3a559d37b5 Merge pull request 'Warmfix[AccountDescriptorMenu]: fixed account descriptor menu' (!1488) from Warmfix-AccountDescriptorMenu into test 
Reviewed-on: verdnatura/salix-front#1488
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-25 11:43:07 +00:00
Pau Rovira bca31ea896 Merge branch 'dev' into 8593-parkingTestsE2e 2025-02-25 11:10:52 +00:00
Jon Elias a99faf17bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 11:57:43 +01:00
Javi Gallego 430995a399 refactor: update labels and conditions in Claim components 2025-02-25 11:49:12 +01:00
Alex Moreno cc0067a57a fix: merge revert 2025-02-25 11:33:28 +01:00
Pablo Natek 5585367ab7 Merge pull request 'refactor: refs #6897 update VnTable components for improved value handling and UI adjustments' (!1480) from 6897-minorFixes into test 
Reviewed-on: verdnatura/salix-front#1480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-25 09:48:36 +00:00
Alex Moreno efd1c1fe87 Merge branch 'test' into 6897-minorFixes 2025-02-25 09:13:03 +00:00
Alex Moreno 0b3e8dedf9 fix: merge revert 2025-02-25 09:56:16 +01:00
Alex Moreno 1e8c6a61f6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-25 09:54:35 +01:00
Alex Moreno d72e45918a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-25 09:53:10 +01:00
Alex Moreno c67ae3e17e Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" 
This reverts commit 223a1ea449.
 2025-02-25 09:53:02 +01:00
Pablo Natek dc3721f62c Merge pull request 'Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"' (!1491) from fix_revert_revert into test 
Reviewed-on: verdnatura/salix-front#1491
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-02-25 08:45:13 +00:00
Alex Moreno b9b5bd4c8a Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" 
This reverts commit 223a1ea449.
 2025-02-25 09:40:46 +01:00
Carlos Satorres 5e803782d3 Merge pull request 'fix: refs #6553 workerBusiness' (!1469) from 6553-fixWorkerBusinessV2 into test 
Reviewed-on: verdnatura/salix-front#1469
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-25 08:14:19 +00:00
Carlos Satorres be858f8134 Merge branch 'test' into 6553-fixWorkerBusinessV2 2025-02-25 08:10:08 +00:00
Javier Segarra c07fd2d2a5 Merge pull request 'HOTFIX: maxium calls exceed' (!1490) from hotfix_customerBalance_newPayment into master 
Reviewed-on: verdnatura/salix-front#1490
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-25 08:06:02 +00:00
Javier Segarra d95b6c1a31 Merge branch 'master' into hotfix_customerBalance_newPayment 2025-02-25 07:36:07 +00:00
Javier Segarra ade32272b4 Merge pull request 'HOTFIX: mana axios deacoplate' (!1489) from hotfix_mana_deacoplate into master 
Reviewed-on: verdnatura/salix-front#1489
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-25 07:35:51 +00:00
Jon Elias c84225aed5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 08:07:40 +01:00
Alex Moreno f2eedce55f fix: merge test to dev 2025-02-25 08:01:10 +01:00
Alex Moreno c89178e6a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-25 07:23:18 +01:00
Pau Rovira b76bf88d24 Merge branch 'dev' into 8593-parkingTestsE2e 2025-02-25 06:04:48 +00:00
Javier Segarra 56f8657bba fix: maxium calls exceed 2025-02-24 22:58:57 +01:00
Javier Segarra e44d6a2915 test: remove test 2025-02-24 22:48:48 +01:00
Javier Segarra b6b3759758 Merge branch 'master' into hotfix_mana_deacoplate 2025-02-24 22:48:00 +01:00
Javier Segarra 2655e0a8e5 fix: mana axios deacoplate 2025-02-24 22:46:27 +01:00
Javier Segarra 223a1ea449 revert 1015acefb7 
revert Merge branch 'test' into master
 2025-02-24 15:52:21 +00:00
Javier Segarra 1015acefb7 Merge branch 'test' into master 2025-02-24 15:21:32 +00:00
Jon Elias 7f1be98b74 fix: fixed account descriptor menu and created e2e 2025-02-24 16:20:28 +01:00
Javier Segarra 3e5180a6c6 Merge pull request 'fix: check type variable' (!1486) from hotfix_mana_showproxy into master 
Reviewed-on: verdnatura/salix-front#1486
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-24 15:18:25 +00:00
Javier Segarra dbcace84f6 Merge branch 'master' into hotfix_mana_showproxy 2025-02-24 16:09:46 +01:00
Javier Segarra ab5ae580b3 fix: check type variable 2025-02-24 16:08:40 +01:00