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

11103 Commits

Author SHA1 Message Date
Jose Antonio Tubau aea81e42de Merge branch 'dev' into 7414-ticketHistoryChanges 2025-02-27 10:54:37 +00:00
Guillermo Bonet c3c8a78fd8 feat: refs #8348 Added grouping 2025-02-27 10:48:17 +01:00
Alex Moreno a3e8c3bd50 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-27 10:32:16 +01:00
Alex Moreno b29115f409 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-27 10:31:53 +01:00
Alex Moreno 84aa5fb401 fix: junit report 2025-02-27 10:29:33 +01:00
Jon Elias 2ebe86fd2e Merge pull request 'Fix[InvoiceOut]: Added lost code' (!1498) from Fix-InvoiceOutLostCode into dev 
Reviewed-on: verdnatura/salix-front#1498
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-27 08:58:20 +00:00
Jon Elias 854a25fb14 Merge pull request '#8649: Fixed style when clicking on icons' (!1475) from Warmfix-SearchbarStyle into test 
Reviewed-on: verdnatura/salix-front#1475
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-27 08:53:04 +00:00
Jon Elias dc4a396004 Merge branch 'test' into Warmfix-SearchbarStyle 2025-02-27 08:51:34 +00:00
Jon Elias f523319613 Merge branch 'dev' into Fix-InvoiceOutLostCode 2025-02-27 08:41:28 +00:00
Alex Moreno a1509500e3 fix: prevent 'cypress run' error to show junit 2025-02-27 09:27:16 +01:00
Pablo Natek 2b26283401 Merge pull request 'refactor: update ItemDescriptor to use dynamic labels for values' (!1505) from hotFixItemDescriptor into master 
Reviewed-on: verdnatura/salix-front#1505
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-27 08:25:55 +00:00
Alex Moreno faac7a0354 Merge pull request 'ci: refs #6695 use TARGET_BRANCH' (!1466) from 6695-fix_CHANGE_TARGET into dev 
Reviewed-on: verdnatura/salix-front#1466
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2025-02-27 08:22:34 +00:00
Jon Elias 837511a0ab Merge branch 'Fix-InvoiceOutLostCode' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceOutLostCode 2025-02-27 09:18:18 +01:00
Jon Elias 6718fa9a3d refactor: adjust translation to standardize it 2025-02-27 09:18:16 +01:00
Pablo Natek 30a1cede35 Merge branch 'master' into hotFixItemDescriptor 2025-02-27 08:10:34 +00:00
Jose Antonio Tubau 6ce55eead6 Merge branch 'dev' into 7414-ticketHistoryChanges 2025-02-27 07:48:31 +00:00
Alex Moreno c053a4d2bd Merge branch 'dev' into 6695-fix_CHANGE_TARGET 2025-02-27 06:43:45 +00:00
Alex Moreno bb5ae07fb0 Merge pull request 'test: refs #8484 await main content loaded' (!1318) from 8484-waitToDomContentLoadedInTests into dev 
Reviewed-on: verdnatura/salix-front#1318
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-27 06:19:44 +00:00
Jorge Penadés c56c415a5a fix: refs #8484 rollback 2025-02-26 16:36:20 +01:00
Jorge Penadés 5d4feb34d7 fix: refs #8484 rollback 2025-02-26 16:29:20 +01:00
Jorge Penadés b48276deab refactor: refs #8484 update specPattern to include all spec files and remove data-cy attribute 2025-02-26 16:27:24 +01:00
Jorge Penadés ae4b420e6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8484-waitToDomContentLoadedInTests 2025-02-26 16:11:22 +01:00
Jorge Penadés f4b8d07e6a test: refs #8484 replace path 2025-02-26 16:07:39 +01:00
Jorge Penadés 63ef21d78e refactor: refs #8484 add data-cy attribute for claim photo image and update test to use it 2025-02-26 16:06:34 +01:00
Carlos Satorres 257068f50f Merge pull request 'fix: refs #6943 e2e clientList, formModel' (!1506) from 6943-fixClientTestE2E into dev 
Reviewed-on: verdnatura/salix-front#1506
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-26 14:48:40 +00:00
Javier Segarra b17f08f467 Merge pull request 'HOTFIX: select fk' (!1507) from hotfix_agency_autoSelected into master 
Reviewed-on: verdnatura/salix-front#1507
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-26 13:41:18 +00:00
Javier Segarra 1c9c703b46 fix: select fk 2025-02-26 14:39:51 +01:00
Alex Moreno 10da670c24 Merge branch 'dev' into 6695-fix_CHANGE_TARGET 2025-02-26 12:59:52 +00:00
Jorge Penadés 8a8233b82f fix: refs #8484 rollback 2025-02-26 13:40:31 +01:00
Jorge Penadés f100ce6cc4 refactor: refs #8484 add data-cy attribute for claim photo image and update test to use it 2025-02-26 13:38:01 +01:00
Jorge Penadés b91f159061 refactor: refs #8484 simplify image dialog test by using aliases for elements 2025-02-26 13:30:39 +01:00
Jorge Penadés bc2b5976d9 refactor: refs #8484 remove unnecessary intercepts and waits in ticket and zone tests 2025-02-26 13:18:22 +01:00
Jorge Penadés df7945f543 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8484-waitToDomContentLoadedInTests 2025-02-26 13:08:41 +01:00
Jon Elias a0f1e91237 Merge branch 'dev' into Fix-InvoiceOutLostCode 2025-02-26 11:58:27 +00:00
Pablo Natek e4c53dde45 Merge branch 'master' into hotFixItemDescriptor 2025-02-26 11:48:30 +00:00
Carlos Satorres 61b7c3cde4 Merge branch 'dev' into 6943-fixClientTestE2E 2025-02-26 11:47:17 +00:00
Carlos Satorres ce8126f5f2 Merge pull request 'fix: fix sctions' (!1400) from fix-workerSections into dev 
Reviewed-on: verdnatura/salix-front#1400
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-26 11:46:54 +00:00
Carlos Satorres d95392a37b Merge branch '6943-fixClientTestE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixClientTestE2E 2025-02-26 12:44:54 +01:00
Carlos Satorres 6baf850470 fix: refs #6943 formModel workerDepartment 2025-02-26 12:44:20 +01:00
Jorge Penadés 05fe2b5b21 refactor: refs #8484 streamline login command and remove commented code 2025-02-26 12:37:57 +01:00
Javier Segarra 56e71b01d3 Merge pull request 'HOTFIX: TicketSale refresh panel data' (!1499) from hotfix_ticketSale_updatePanel into master 
Reviewed-on: verdnatura/salix-front#1499
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-26 11:35:58 +00:00
Alex Moreno 7478ba612f Merge branch 'dev' into 6943-fixClientTestE2E 2025-02-26 11:35:28 +00:00
Pablo Natek c362282772 Merge branch 'master' into hotFixItemDescriptor 2025-02-26 11:32:38 +00:00
Carlos Satorres cb034dc406 fix: refs #6943 e2e clientList, formModel 2025-02-26 12:29:17 +01:00
Jon Elias 87d25c55b4 Merge branch 'dev' into fix-workerSections 2025-02-26 11:28:51 +00:00
Pablo Natek 754d673d0b refactor: update ItemDescriptor to use dynamic labels for values 2025-02-26 12:19:51 +01:00
Jorge Penadés f48b2bbab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8484-waitToDomContentLoadedInTests 2025-02-26 10:40:20 +01:00
Javier Segarra d2b7d80da6 Merge branch 'master' into hotfix_ticketSale_updatePanel 2025-02-26 09:34:37 +00:00
Alex Moreno 63293d550e Merge branch 'dev' into 6695-fix_CHANGE_TARGET 2025-02-26 09:31:31 +00:00
Alex Moreno 60dfda5921 fix: revert cypress.config 2025-02-26 10:30:17 +01:00