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

11144 Commits

Author SHA1 Message Date
Pablo Natek fe695af9ab test: refs #6897 enable 'Create entry, modify travel and add buys' test case 2025-02-23 07:04:02 +01:00
Carlos Satorres 5481ad6478 fix: refs #6553 workerBusiness 2025-02-21 15:23:44 +01:00
Alex Moreno 9d5e04a8ae ci: refs #6695 update Jenkinsfile to remove echo statement for TARGET_BRANCH 2025-02-21 15:15:52 +01:00
Alex Moreno ddbae9a13d ci: refs #6695 update Jenkinsfile to improve TARGET_BRANCH assignment logic 2025-02-21 15:14:16 +01:00
Alex Moreno b2ae8c5714 ci: refs #6695 update Jenkinsfile to improve TARGET_BRANCH assignment logic 2025-02-21 15:12:15 +01:00
Alex Moreno 6f688c337e ci: refs #6695 update Jenkinsfile to include 'main' and 'beta' in protected branches 2025-02-21 15:07:01 +01:00
Javi Gallego 039a7ff421 Merge branch '7937-claimAgile' of https://gitea.verdnatura.es/verdnatura/salix-front into 7937-claimAgile 2025-02-21 14:59:37 +01:00
Javi Gallego a7b202527f Merge branch 'dev' into 7937-claimAgile 2025-02-21 14:59:32 +01:00
Alex Moreno fe6f575f7c Merge branch 'dev' into 6695-fix_CHANGE_TARGET 2025-02-21 13:52:32 +00:00
Alex Moreno 05994ba1dc ci: refs #6695 remove unnecessary echo statements from Jenkinsfile 2025-02-21 14:52:12 +01:00
Alex Moreno 1018a0aa90 ci: refs #6695 remove unnecessary echo statements from Jenkinsfile 2025-02-21 14:49:32 +01:00
Javier Segarra c7b753a4ef Merge pull request 'Add mapper fn beforeSave' (!1368) from formModel_mapper into dev 
Reviewed-on: verdnatura/salix-front#1368
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-21 13:35:01 +00:00
Alex Moreno 39b7cfbe4e ci: refs #6695 update docker-compose to use dynamic image tags 2025-02-21 14:26:26 +01:00
Alex Moreno f494021dc8 Merge branch 'dev' into formModel_mapper 2025-02-21 13:18:52 +00:00
Alex Moreno 7de471a666 Merge branch 'dev' into 7937-claimAgile 2025-02-21 13:16:57 +00:00
Alex Moreno 64549603ca ci: refs #6695 update docker-compose to use dynamic image tags 2025-02-21 13:54:37 +01:00
Alex Moreno e0d0830793 ci: refs #6695 comment out test stages in Jenkinsfile 2025-02-21 13:46:35 +01:00
Alex Moreno 3e2d7fad61 Merge pull request '6695-docker_push_3' (!1423) from 6695-docker_push_3 into dev 
Reviewed-on: verdnatura/salix-front#1423
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-21 12:41:36 +00:00
Alex Moreno f71a83d587 Merge branch '6695-docker_push_3' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-docker_push_3 2025-02-21 13:23:32 +01:00
Alex Moreno 4da25bb564 ci: refs #6695 skip intermitent e2e 2025-02-21 13:23:31 +01:00
Alex Moreno e0362801db Merge branch 'dev' into 6695-docker_push_3 2025-02-21 12:09:49 +00:00
Alex Moreno 1a14440850 ci: refs #6695 skip intermitent e2e 2025-02-21 13:09:31 +01:00
PAU ROVIRA ROSALENY b16fee0931 Merge branch 'dev' into 8593-parkingTestsE2e 2025-02-21 12:05:41 +00:00
PAU ROVIRA ROSALENY 8f2e42ecbb feat: refs #8593 added summary button & modified e2e tests 2025-02-21 13:04:49 +01:00
Javi Gallego dafd30f480 Merge branch 'dev' into 7937-claimAgile 2025-02-21 12:58:36 +01:00
Alex Moreno ade49b2bb0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-21 12:57:43 +01:00
Alex Moreno deaeee07e0 Merge branch 'dev' into 6695-docker_push_3 2025-02-21 11:46:35 +00:00
Jon Elias 15a1098506 Merge pull request '#8599: Modified tests to be more complete and added new ones' (!1409) from 8599-ModifyAndCreateInvoiceOutTests into dev 
Reviewed-on: verdnatura/salix-front#1409
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-21 11:36:47 +00:00
Juan Ferrer 088fd0b710 ci: refs #6695 cypress junit file renamed, e2e focus removed 2025-02-21 12:20:05 +01:00
Juan Ferrer de9f3f32fd ci: refs #6695 vitest junit file fix 2025-02-21 12:17:05 +01:00
Juan Ferrer 1a137f5f3d ci: refs #6695 CI env var moved to test stage 2025-02-21 12:12:18 +01:00
Javier Segarra 8c69e5c937 Merge pull request 'HOTFIX: shipped columnFilter' (!1463) from hotfix_ticket_shipped into master 
Reviewed-on: verdnatura/salix-front#1463
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-21 11:02:43 +00:00
Juan Ferrer 22a173b7f7 ci: refs #6695 JUnit report fixes 2025-02-21 12:01:28 +01:00
Javier Segarra 26009d809e Merge branch 'master' into hotfix_ticket_shipped 2025-02-21 10:50:34 +00:00
Juan Ferrer 9350c512ff ci: refs #6695 JUnit console report disabled 2025-02-21 11:47:16 +01:00
Javier Segarra 680c1f9d9c perf: i18n 2025-02-21 11:45:41 +01:00
Javier Segarra ef624af3f8 revert: column time 2025-02-21 11:44:07 +01:00
Juan Ferrer d2d06f012d ci: refs #6695 Final working version, test focus removed 2025-02-21 11:43:47 +01:00
Juan Ferrer 0c68265408 ci: refs #6695 cypress reporter fix 2025-02-21 11:39:39 +01:00
Javier Segarra 81a33dd2fc fix: shipped columnFilter 2025-02-21 11:38:32 +01:00
Juan Ferrer cf678b423d ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:36:02 +01:00
Juan Ferrer b4bde21d06 ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:32:40 +01:00
Jon Elias ebcd1bf6e6 Merge branch '8599-ModifyAndCreateInvoiceOutTests' of https://gitea.verdnatura.es/verdnatura/salix-front into 8599-ModifyAndCreateInvoiceOutTests 2025-02-21 11:30:32 +01:00
Jon Elias c744d3f6aa refactor: refs #8599 corrected it name 2025-02-21 11:30:30 +01:00
Juan Ferrer 3dfce751dc ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:29:34 +01:00
Juan Ferrer a45e632e31 ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:25:26 +01:00
Jon Elias c121e7d864 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8599-ModifyAndCreateInvoiceOutTests 2025-02-21 11:24:33 +01:00
Juan Ferrer 5927fb4548 ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:22:37 +01:00
Juan Ferrer 20e767991b ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 11:18:27 +01:00
Juan Ferrer b45ff6817d Merge branch '6695-docker_push_3' of https: refs #6695//gitea.verdnatura.es/verdnatura/salix-front into 6695-docker_push_3 2025-02-21 10:49:36 +01:00