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

11686 Commits

Author SHA1 Message Date
Carlos Satorres 4b1946c93b Merge branch 'dev' into 8583-workerE2ETest 2025-03-10 10:50:07 +00:00
Carlos Satorres 3647dbe17c Merge branch '8583-workerE2ETest' of https://gitea.verdnatura.es/verdnatura/salix-front into 8583-workerE2ETest 2025-03-10 11:39:52 +01:00
Carlos Satorres 1a824cd363 fix: refs #8583 fix AddCard 2025-03-10 11:39:49 +01:00
Javier Segarra ae7e9d85aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 11:27:37 +01:00
Javier Segarra 7a244412ef test: skip random fail test 2025-03-10 11:27:35 +01:00
Alex Moreno 18871d5808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 11:05:42 +01:00
Alex Moreno abce10b4ee fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 2025-03-10 11:05:40 +01:00
Jose Antonio Tubau d4151a33d3 Merge pull request '8472-unifyStileForMoreCreateDialogSlot' (!1577) from 8472-unifyStileForMoreCreateDialogSlot into dev 
Reviewed-on: verdnatura/salix-front#1577
Reviewed-by: Jose Antonio Tubau <jtubau@verdnatura.es>
 2025-03-10 09:09:51 +00:00
Jose Antonio Tubau aa377f44c0 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 09:02:30 +00:00
Alex Moreno f627b1b775 test(TicketList): fix inconsistency 2025-03-10 09:57:10 +01:00
Jose Antonio Tubau f65a317537 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 08:29:43 +00:00
Alex Moreno e9d46ee259 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 09:21:31 +01:00
Alex Moreno e6554027ce Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-10 09:21:19 +01:00
Carlos Satorres 1dce660239 Merge branch 'dev' into 8583-workerE2ETest 2025-03-10 07:38:45 +00:00
Jose Antonio Tubau a9302c8033 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 08:24:38 +01:00
Carlos Satorres 0f8754e242 Merge pull request 'fix: refs #8727 hotfix customerMandate' (!1580) from 8727-fixCustomerMandate into master 
Reviewed-on: verdnatura/salix-front#1580
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-10 06:39:38 +00:00
Carlos Satorres 3a104fb51e fix: refs #8727 hotfix customerMandate 2025-03-10 07:29:20 +01:00
Alex Moreno 1f6667fbce Merge pull request '8322-Wagon' (!1569) from 8322-Wagon into dev 
Reviewed-on: verdnatura/salix-front#1569
 2025-03-07 12:37:27 +00:00
Carlos Satorres 95d5e5c4ae Merge branch 'dev' into 8583-workerE2ETest 2025-03-07 12:21:50 +00:00
Alex Moreno 4a5b910433 Merge branch 'dev' into 8322-Wagon 2025-03-07 12:19:47 +00:00
Alex Moreno dfddab0892 test: skip route extended list tests in Cypress 2025-03-07 13:19:31 +01:00
Jon Elias 1f0414bd91 Merge pull request '#8045: Modified redirect from CardDescriptor' (!1495) from 8045-FixIconDescriptorRedirect into dev 
Reviewed-on: verdnatura/salix-front#1495
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-07 12:09:20 +00:00
Alex Moreno e075685445 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-07 11:19:07 +00:00
Jon Elias 5c895d8449 Merge branch 'dev' into 8045-FixIconDescriptorRedirect 2025-03-07 10:59:37 +00:00
Alex Moreno 32d1381003 Merge branch 'dev' into 8322-Wagon 2025-03-07 10:53:52 +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 bc1b09eb50 Merge branch 'dev' into 8045-FixIconDescriptorRedirect 2025-03-07 10:27:32 +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 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
Carlos Satorres 7736151c90 Merge branch 'dev' into 8583-workerE2ETest 2025-03-07 09:46:40 +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
Alex Moreno 5ab4aa3e36 Merge branch 'dev' into 8045-FixIconDescriptorRedirect 2025-03-07 07:31:39 +00:00
Alex Moreno 5ed3c9b3f0 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-07 07:18:43 +00:00
Jose Antonio Tubau 178109d451 Merge branch 'dev' into 8619-fixRouteExtendedListTest 2025-03-07 07:11:49 +00:00
Alex Moreno 2c4fba4fce Merge branch 'dev' into 8322-Wagon 2025-03-07 07:07:21 +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
Pablo Natek 7c0c1076e9 Merge pull request 'fix: update filter prop to user-filter in CustomerMandates component' (!1575) from HotFixCustomerMandate into master 
Reviewed-on: verdnatura/salix-front#1575
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-07 06:48:10 +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
Pablo Natek 287d592a94 fix: update filter prop to user-filter in CustomerMandates component 2025-03-07 07:43:57 +01:00
Carlos Satorres 0577a6ace7 Merge branch 'dev' into 8583-workerE2ETest 2025-03-07 06:37:49 +00:00
Carlos Satorres 4c7653d77d fix: refs #8583 dataCy operator 2025-03-07 07:32:53 +01:00
Carlos Satorres 2b3308bde7 fix: refs #8583 workerE2E 2025-03-07 07:15:41 +01:00
Jon Elias 52ca695276 Merge branch 'dev' into 8045-FixIconDescriptorRedirect 2025-03-07 06:14:59 +00:00
Alex Moreno b8c55f30aa Merge branch 'dev' into 8322-Wagon 2025-03-07 06:04:34 +00:00