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

11595 Commits

Author SHA1 Message Date
Jose Antonio Tubau d6f53ad63c fix: refs #8626 remove duplicate ref attribute from RouteList.vue 2025-03-07 13:24:57 +01:00
Jose Antonio Tubau a9f8bf3f9c Merge branch '8626-addTestCasesInRouteListTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 8626-addTestCasesInRouteListTest 2025-03-07 12:56:51 +01:00
Jose Antonio Tubau 9ce9a1fb2c Merge branch 'dev' of into 8626-addTestCasesInRouteListTest 2025-03-07 12:56:47 +01:00
Alex Moreno 76e69ca7c2 Merge branch 'dev' into 8626-addTestCasesInRouteListTest 2025-03-07 11:13:01 +00:00
Jon Elias df238c3015 Merge pull request '#8606: Zone module to VnCardBeta' (!1462) from 8606-FixZoneModuleV2 into dev 
Reviewed-on: verdnatura/salix-front#1462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-07 10:53:08 +00:00
Jon Elias ebc45eb698 Merge branch 'dev' into 8606-FixZoneModuleV2 2025-03-07 10:36:56 +00:00
Jon Elias 60ae21747f fix: refs #8606 deleted code 2025-03-07 11:25:24 +01:00
Jon Elias 69e5495ccb refactor: refs #8606 requested changes 2025-03-07 11:23:34 +01:00
Jose Antonio Tubau 74a9adec5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8626-addTestCasesInRouteListTest 2025-03-07 11:20:34 +01:00
Jose Antonio Tubau 833e7c01d3 Merge pull request 'fix: refs #8618 update route descriptor to handle empty ticket records and adjust test cases' (!1478) from 8619-fixRouteExtendedListTest into dev 
Reviewed-on: verdnatura/salix-front#1478
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-07 10:06:45 +00:00
Jose Antonio Tubau d1f4ebc98f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8619-fixRouteExtendedListTest 2025-03-07 10:58:24 +01:00
Jose Antonio Tubau ccba0d038e Merge branch 'dev' into 8626-addTestCasesInRouteListTest 2025-03-07 08:28:02 +00:00
Alex Moreno 3a63fd6e96 Merge pull request 'ci: refs #6695 Cypress parallel x3' (!1566) from 6695-jenkins_e2e_parallel_x3 into dev 
Reviewed-on: verdnatura/salix-front#1566
Reviewed-by: administrator <noreply@verdnatura.es>
 2025-03-07 07:52:03 +00:00
Alex Moreno c5b56d8753 Merge branch 'dev' into 6695-jenkins_e2e_parallel_x3 2025-03-07 07:44:40 +00:00
Jose Antonio Tubau 178109d451 Merge branch 'dev' into 8619-fixRouteExtendedListTest 2025-03-07 07:11:49 +00:00
Alex Moreno a8a1fcea43 test: fix orderList e2e, unestables 2025-03-07 08:06:58 +01:00
Alex Moreno b37d855539 Merge branch 'dev' into 6695-jenkins_e2e_parallel_x3 2025-03-07 06:50:52 +00:00
Jon Elias 147c8aed9e Merge branch '8606-FixZoneModuleV2' of https://gitea.verdnatura.es/verdnatura/salix-front into 8606-FixZoneModuleV2 2025-03-07 07:44:32 +01:00
Jon Elias 504f70ab55 refactor: refs #8606 deleted code and fixed translation 2025-03-07 07:44:31 +01:00
Jon Elias ed41eb8212 Merge branch 'dev' into 8606-FixZoneModuleV2 2025-03-07 05:03:09 +00:00
Alex Moreno b39aeb46a2 refactor: simplify client selection in order creation test 2025-03-06 14:59:51 +01:00
Alex Moreno de4e3d6675 test: skip Ticket Lack detail test case 2025-03-06 14:50:47 +01:00
Jon Elias ac84537e19 refactor: refs #8606 clear some warnings 2025-03-06 13:49:32 +01:00
Jon Elias 6ffb62497b refactor: refs #8606 merged previous and e2e changes and corrected minor errors 2025-03-06 13:46:56 +01:00
Alex Moreno 0b1c07419d Merge branch 'dev' into 6695-jenkins_e2e_parallel_x3 2025-03-06 12:27:54 +00:00
Jon Elias d679436171 Merge branch '8606-FixZoneModuleV2' of https://gitea.verdnatura.es/verdnatura/salix-front into 8606-FixZoneModuleV2 2025-03-06 12:21:12 +01:00
Jon Elias 1057e1d469 Merge branch 'dev' of https: refs #8606//gitea.verdnatura.es/verdnatura/salix-front into 8606-FixZoneModuleV2 2025-03-06 12:21:10 +01:00
Jon Elias a0e79104a8 Merge pull request '#8600: Added and modified E2E' (!1447) from 8600-CreateZoneE2E into dev 
Reviewed-on: verdnatura/salix-front#1447
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-06 11:16:38 +00:00
Jon Elias 81ab122ce6 Merge branch 'dev' into 8600-CreateZoneE2E 2025-03-06 11:06:51 +00:00
Jon Elias c38fedb408 fix: refs #8600 e2e 2025-03-06 11:56:15 +01:00
Alex Moreno 19f3e0bf82 Merge branch 'dev' of https: refs #6695//gitea.verdnatura.es/verdnatura/salix-front into 6695-jenkins_e2e_parallel_x3 2025-03-06 11:51:40 +01:00
Alex Moreno aa5692abd3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-06 11:50:54 +01:00
Alex Moreno fa23974098 fix: add --init flag to Cypress Docker container for improved stability 2025-03-06 11:50:38 +01:00
Alex Moreno 6cfcc2f81b fix: add --init flag to Docker container for Cypress tests 2025-03-06 11:50:11 +01:00
Jon Elias 6930cb63d9 Merge branch '8600-CreateZoneE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E 2025-03-06 11:40:46 +01:00
Jon Elias 04b2cfe541 Merge branch 'dev' of https: refs #8600//gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E 2025-03-06 11:40:45 +01:00
Alex Moreno 1457289969 feat: refs #6695 update Cypress parallel test execution to use 3 instances 2025-03-06 11:34:43 +01:00
Alex Moreno 91e25acd55 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-06 11:33:17 +01:00
Alex Moreno 267d74046a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-06 11:32:46 +01:00
Jorge Penadés eee7402519 Merge pull request 'fix: refs #8316 add rectificative handling in invoiceIn route' (!1565) from 8316-hotfix-checkRectificative into master 
Reviewed-on: verdnatura/salix-front#1565
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-06 09:45:10 +00:00
Jorge Penadés 3679cbd253 fix: refs #8316 add rectificative handling in invoiceIn route 2025-03-06 10:16:27 +01:00
Jon Elias d450786ff2 Merge pull request '#8074: Modify spinner size' (!1521) from 8074-AddLoaderInPaginate into dev 
Reviewed-on: verdnatura/salix-front#1521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-06 09:02:28 +00:00
Jon Elias fce8ae4508 Merge branch 'dev' into 8074-AddLoaderInPaginate 2025-03-06 08:51:15 +00:00
Alex Moreno 376993b978 Merge pull request 'ci: refs #6695 feat jenkins parallel e2e' (!1473) from 6695-jenkins_e2e_parallel into dev 
Reviewed-on: verdnatura/salix-front#1473
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-03-06 08:35:44 +00:00
Alex Moreno a462d705f5 fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies 2025-03-06 09:21:58 +01:00
Alex Moreno 489e7850ab fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection 2025-03-06 09:13:08 +01:00
Javier Segarra 6a182d5403 fix: remove deprecated condition to check 2025-03-06 08:39:27 +01:00
Alex Moreno e5b524e8a0 fix(cypressParallel.sh): refs #6695 simplify test execution output format 2025-03-06 08:23:36 +01:00
Alex Moreno 0595163f58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-jenkins_e2e_parallel 2025-03-06 08:23:06 +01:00
Alex Moreno a53f5db047 fix(cypressParallel.sh): refs #6695 improve test execution output for clarity 2025-03-06 08:23:04 +01:00