Commit Graph

10882 Commits

Author SHA1 Message Date
Javi Gallego a01bc279bc Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-24 14:07:38 +01:00
Javi Gallego edb7d6f7ed Merge pull request '7937-claimAgile' (!1369) from 7937-claimAgile into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-24 12:44:19 +00:00
Javi Gallego 45def7f953 fix: refs #7937 update claimId in ClaimAction test to reflect correct value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-24 13:27:55 +01:00
Javi Gallego 6ddbce368f Merge branch 'dev' into 7937-claimAgile 2025-02-24 12:32:11 +01:00
Pablo Natek f465b8219e Merge pull request 'test: refs #6897 enable 'Create entry, modify travel and add buys' test case' (!1470) from 6897-fixEntryE2e into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1470
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-24 11:17:21 +00:00
Pablo Natek 92e663497b refactor: refs #6897 clean up Cypress configuration and improve entry list filtering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-23 11:33:50 +01:00
Pablo Natek fe695af9ab test: refs #6897 enable 'Create entry, modify travel and add buys' test case
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 07:04:02 +01:00
Javi Gallego 039a7ff421 Merge branch '7937-claimAgile' of https://gitea.verdnatura.es/verdnatura/salix-front into 7937-claimAgile
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
Javier Segarra c7b753a4ef Merge pull request 'Add mapper fn beforeSave' (!1368) from formModel_mapper into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1368
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-21 13:35:01 +00:00
Alex Moreno f494021dc8 Merge branch 'dev' into formModel_mapper
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 13:18:52 +00:00
Alex Moreno 7de471a666 Merge branch 'dev' into 7937-claimAgile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 13:16:57 +00:00
Alex Moreno 3e2d7fad61 Merge pull request '6695-docker_push_3' (!1423) from 6695-docker_push_3 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-02-21 12:09:49 +00:00
Alex Moreno 1a14440850 ci: refs #6695 skip intermitent e2e
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-21 13:09:31 +01:00
Javi Gallego dafd30f480 Merge branch 'dev' into 7937-claimAgile 2025-02-21 12:58:36 +01:00
Javi Gallego bcb47f6fde fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue 2025-02-21 12:58:11 +01:00
Alex Moreno ade49b2bb0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-21 12:57:43 +01:00
Alex Moreno deaeee07e0 Merge branch 'dev' into 6695-docker_push_3
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 12:20:05 +01:00
Juan Ferrer de9f3f32fd ci: refs #6695 vitest junit file fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 12:17:05 +01:00
Juan Ferrer 1a137f5f3d ci: refs #6695 CI env var moved to test stage
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 12:12:18 +01:00
Juan Ferrer 22a173b7f7 ci: refs #6695 JUnit report fixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 12:01:28 +01:00
Juan Ferrer 9350c512ff ci: refs #6695 JUnit console report disabled
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-02-21 11:47:16 +01:00
Juan Ferrer d2d06f012d ci: refs #6695 Final working version, test focus removed
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-02-21 11:43:47 +01:00
Juan Ferrer 0c68265408 ci: refs #6695 cypress reporter fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 11:39:39 +01:00
Juan Ferrer cf678b423d ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 11:36:02 +01:00
Juan Ferrer b4bde21d06 ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 11:29:34 +01:00
Juan Ferrer a45e632e31 ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 11:22:37 +01:00
Juan Ferrer 20e767991b ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 10:49:36 +01:00
Juan Ferrer 17e837c35e ci: refs #6695 Docker & Jenkinsfile fixes/refactor 2025-02-21 10:48:47 +01:00
Jon Elias 669257e98d Merge pull request '#8402: Added lost filters from Salix' (!1460) from 8402-AddNewFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1460
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-21 08:24:19 +00:00
Javi Gallego da86116726 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-21 09:14:54 +01:00
Jon Elias 5928b7a05c Merge branch 'dev' into 8402-AddNewFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 07:53:34 +00:00
Jon Elias 58cf8ab29d feat: refs #8402 added lost filters from Salix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 08:50:57 +01:00
Jon Elias 56da517c0d Merge branch 'dev' into 8599-ModifyAndCreateInvoiceOutTests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 07:21:40 +00:00
Jon Elias d2b1cd4067 refactor: refs #8599 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 08:20:35 +01:00
Pablo Natek b611430d7a Merge pull request 'fix: refs #6897 enhance column value formatting to include text value fallback' (!1459) from 6897-fixUpdatedValueOnList into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1459
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-21 07:07:53 +00:00
Alex Moreno 1163b9dc2e Merge branch 'test' into 6897-fixUpdatedValueOnList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-21 07:03:43 +00:00
Pablo Natek 206cecd213 fix: refs #6897 enhance column value formatting to include text value fallback
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-21 07:57:40 +01:00
Alex Moreno 0277d1eb86 ci: refs #6695 update Docker Compose command to run in detached mode
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 07:57:16 +01:00