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

12677 Commits

Author SHA1 Message Date
Jon Elias 0ff590d5bb fix: fixed submodule descriptors icons 2025-03-20 16:30:38 +01:00
Alex Moreno 5d6784588f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-20 14:39:10 +01:00
Alex Moreno 6c84c4ae77 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-20 14:38:58 +01:00
Benjamin Esteve 7de4bd4f4a fix: refs #8118 update Cypress parallel test execution to run with two instances 2025-03-20 13:01:13 +01:00
Benjamin Esteve 489fcda410 fix: refs #8683 update Cypress parallel test execution to run with a single instance 2025-03-20 12:59:33 +01:00
Benjamin Esteve efb6c2357b fix: refs #8118 update Cypress parallel test execution to run with a single instance 2025-03-20 12:55:46 +01:00
Carlos Satorres 26ac4cf7cc Merge pull request 'fix: refs #7323 department' (!1615) from 7323-workerDepartmentFix into master 
Reviewed-on: verdnatura/salix-front#1615
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-20 11:41:18 +00:00
Carlos Satorres b2eaf7543c fix: refs #7323 department 2025-03-20 12:25:14 +01:00
Jon Elias 0d63c4ec2c Merge pull request 'Warmifx[CardDescriptor]: Fixed department descriptor icon' (!1612) from Warmfix-DepartmentIcon into test 
Reviewed-on: verdnatura/salix-front#1612
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-20 11:19:10 +00:00
Benjamin Esteve 198b4ab338 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-20 09:11:26 +00:00
Benjamin Esteve b7309298aa refactor: refs #8118 simplify VnDropdown usage and replace onMounted data fetching with FetchData component 2025-03-20 10:04:27 +01:00
Benjamin Esteve 6848758258 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-20 10:03:53 +01:00
Jorge Penadés 25fce95265 Merge pull request '#8581 invoiceIn e2e' (!1452) from 8581-invoiceinE2e into dev 
Reviewed-on: verdnatura/salix-front#1452
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-20 08:57:59 +00:00
Benjamin Esteve 030d9213c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-20 09:34:00 +01:00
Jon Elias 9ae89eaf93 refactor: deleted useless 2025-03-20 09:24:56 +01:00
Jorge Penadés af3b64b86f fix: refs #8581 update test to check cardDescriptor_subtitle instead of descriptor_id 2025-03-20 08:59:41 +01:00
Jorge Penadés 5c0f519073 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-20 08:59:35 +01:00
Jon Elias f9bb8d2a93 Merge pull request '#7869: Added include and exclude event from list' (!1574) from 7869-ModifyZones into dev 
Reviewed-on: verdnatura/salix-front#1574
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-20 07:39:08 +00:00
Benjamin Esteve 102e93ccf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-20 08:10:34 +01:00
Benjamin Esteve a286400828 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-20 08:09:49 +01:00
Jon Elias 5ec0da63f2 Merge branch 'dev' into 7869-ModifyZones 2025-03-20 07:01:41 +00:00
Alex Moreno edb3c0cbce Merge pull request '6994-vnLog_descriptors' (!1579) from 6994-vnLog_descriptors into dev 
Reviewed-on: verdnatura/salix-front#1579
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-20 06:58:19 +00:00
Alex Moreno 9f3c068245 Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:46:07 +00:00
Alex Moreno 872d89339a Merge pull request 'feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline' (!1596) from 6695-artifacts into dev 
Reviewed-on: verdnatura/salix-front#1596
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2025-03-20 06:44:03 +00:00
Alex Moreno 0aec126d71 Merge branch 'dev' into 8463-CardDescriptor_useCard 2025-03-20 06:43:46 +00:00
Alex Moreno 72d1281bde Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:20:13 +00:00
Alex Moreno ccbd624389 Merge branch 'dev' into 6695-artifacts 2025-03-20 06:19:16 +00:00
Alex Moreno 30d287bbf6 Merge pull request '5926-refactor_docuware' (!1613) from 5926-refactor_docuware into dev 
Reviewed-on: verdnatura/salix-front#1613
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-18 13:59:04 +00:00
Alex Moreno b6706218fe feat: refs #8463 add data attributes for summary buttons in VnDescriptor component 2025-03-18 14:46:51 +01:00
Alex Moreno d9d40da4f1 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard 2025-03-18 14:45:11 +01:00
Jorge Penadés f107684473 fix: refs #8581 update data-cy attribute concatenation in VnInputDate component 2025-03-18 14:21:16 +01:00
Alex Moreno 0160897030 Merge branch 'dev' into 5926-refactor_docuware 2025-03-18 13:20:00 +00:00
Jon Elias 42022889b2 fix: card descriptor imports 2025-03-18 14:13:01 +01:00
Jon Elias 092a338e72 fix: card descriptor merge 2025-03-18 14:03:38 +01:00
Jon Elias fb912725b3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-DepartmentIcon 2025-03-18 14:01:53 +01:00
Jon Elias 1caa3055f3 fix: fixed department descriptor icon 2025-03-18 13:59:13 +01:00
Jon Elias 4a1b6136d8 Merge pull request 'Hotfix[SendSms]: Fixed SMS when clients do not have phone' (!1610) from Hotfix-RouteSendSms into master 
Reviewed-on: verdnatura/salix-front#1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 11:55:40 +00:00
Alex Moreno c55304e1d2 refactor: refs #5926 simplify sendDocuware function to accept multiple tickets 2025-03-18 12:32:25 +01:00
Jon Elias 8ae196ac3d Merge branch 'master' into Hotfix-RouteSendSms 2025-03-18 11:25:32 +00:00
Jon Elias dfdb9685d2 fix: fixed sms when clients do not have phone 2025-03-18 12:09:46 +01:00
Jorge Penadés 6546d06f60 refactor: refs #8388 update UI feedback 2025-03-18 12:04:54 +01:00
Jorge Penadés 05bc79ec32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-18 12:02:40 +01:00
Jorge Penadés 6e801e8f64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:49:02 +01:00
Jose Antonio Tubau d698275ba2 Merge pull request 'refactor: refs #8721 swap 'client' and 'street' columns' (!1608) from 8721-reorderColumnsRouteTickets into dev 
Reviewed-on: verdnatura/salix-front#1608
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 10:44:45 +00:00
Jose Antonio Tubau 6d1f1770dd Merge branch 'dev' into 8721-reorderColumnsRouteTickets 2025-03-18 10:32:13 +00:00
Jorge Penadés ce5be197ce Merge branch '8581-invoiceinE2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:27:37 +01:00
Jorge Penadés 7ed7a38df2 fix: refs #8581 rollback 2025-03-18 11:27:35 +01:00
Jorge Penadés bfd62eaa54 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:23:01 +01:00
Jorge Penadés c2c21098bb Merge pull request 'feat: refs #8775 enhance VnSelect component with nextTick for improved loading handling' (!1607) from 8775-hotfix-virtualScroll into master 
Reviewed-on: verdnatura/salix-front#1607
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 09:28:43 +00:00
Jose Antonio Tubau acbe0730bb refactor: refs #8721 swap 'client' and 'street' columns 2025-03-18 10:15:18 +01:00