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

11402 Commits

Author SHA1 Message Date
Javier Segarra ba98816f93 Merge branch 'test' into 7356_ticketService 2025-03-01 01:41:22 +00:00
Javier Segarra f472c9355c Merge branch 'test' into 8242_leftMenu_responsive 2025-03-01 01:40:27 +00:00
Javier Segarra e97c499e39 feat: rename test:unit by test:front 2025-03-01 02:23:59 +01:00
Javier Segarra c3b9a4f719 feat: add --browser chromium 2025-03-01 02:23:47 +01:00
Javier Segarra 3b88f5e5cf Merge pull request '#8681 - (Mejoras) TicketAdvance' (!1513) from 8681_ticketAdvance_updates into test 
Reviewed-on: verdnatura/salix-front#1513
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-28 21:26:41 +00:00
Javier Segarra 358c9fa81a Merge branch 'test' into 8681_ticketAdvance_updates 2025-02-28 18:29:22 +00:00
Javier Segarra 2272cbd712 Merge branch 'master' into hotFix_orderCatalog_reload 2025-02-28 17:52:12 +00:00
Javier Segarra 4e02783f54 Merge pull request 'HOTFIX: customer table ticket list' (!1526) from hotfix_customerTable_tickets into master 
Reviewed-on: verdnatura/salix-front#1526
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-28 17:50:25 +00:00
Carlos Satorres 65ed302594 fix: hotfix calendar error400 2025-02-28 15:32:02 +01:00
Carlos Satorres 910e726879 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2025-02-28 15:31:06 +01:00
Carlos Satorres 38658b6df9 fix: error 400 2025-02-28 15:31:01 +01:00
Jose Antonio Tubau ef313c052e Merge pull request 'refactor: refs #7414 update VnLog component to change display order value changes on update action' (!1309) from 7414-ticketHistoryChanges into dev 
Reviewed-on: verdnatura/salix-front#1309
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 14:04:46 +00:00
Javier Segarra 824ed0b8d6 fix: customer table ticket list 2025-02-28 14:59:06 +01:00
Alex Moreno 8643733850 feat(orderCatalog): load when reload section 2025-02-28 14:28:09 +01:00
Jose Antonio Tubau ee91c8410b Merge branch 'dev' into 7414-ticketHistoryChanges 2025-02-28 13:14:24 +00:00
Alex Moreno 15a6e3a3c5 test: skip EntryStockBought test suite 2025-02-28 14:12:12 +01:00
Alex Moreno 391777195a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-28 13:52:02 +01:00
Pablo Natek ae72027f97 Merge pull request 'refactor: refs #6897 update component props and improve UI handling in Entry pages' (!1520) from 6897-fixSomeCaus into test 
Reviewed-on: verdnatura/salix-front#1520
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 12:29:16 +00:00
Pablo Natek 61aa750ae0 refactor: refs #6897 remove debug logs and unused style 2025-02-28 13:00:15 +01:00
Pablo Natek 1aa2cb7316 Merge branch 'test' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-fixSomeCaus 2025-02-28 12:56:47 +01:00
Pablo Natek 8cf4d36f47 refactor: refs #6897 update component props and improve UI handling in Entry pages 2025-02-28 12:55:15 +01:00
Alex Moreno c8e2df41fd refactor: skip claimNotes 2025-02-28 12:53:51 +01:00
Jose Antonio Tubau c52eb44945 Merge pull request '#8620 - createTestE2ERouteAutonomous' (!1461) from 8620-createTestE2ERouteAutonomous into dev 
Reviewed-on: verdnatura/salix-front#1461
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-28 11:03:57 +00:00
Jose Antonio Tubau b3680fb5df Merge branch 'dev' into 8620-createTestE2ERouteAutonomous 2025-02-28 10:34:01 +00:00
Alex Moreno 29aade8c3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-28 11:11:17 +01:00
Carlos Satorres cf23d7a1d7 Merge pull request 'fix: refs #6553 workerBusiness v3' (!1516) from 6553-workerBusinessV3 into test 
Reviewed-on: verdnatura/salix-front#1516
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 10:10:13 +00:00
Jose Antonio Tubau dcaab8ba22 Merge branch '8620-createTestE2ERouteAutonomous' of https://gitea.verdnatura.es/verdnatura/salix-front into 8620-createTestE2ERouteAutonomous 2025-02-28 10:37:04 +01:00
Jose Antonio Tubau 0ec0dcdd9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8620-createTestE2ERouteAutonomous 2025-02-28 10:36:58 +01:00
Alex Moreno edd20c26c4 Merge branch 'test' into 6553-workerBusinessV3 2025-02-28 09:34:29 +00:00
Carlos Satorres 518ec2f49b fix: refs #6553 workerBusiness v3 2025-02-28 10:32:09 +01:00
Alex Moreno 6a0584d7dd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-28 10:21:23 +01:00
Alex Moreno e29d03d244 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-28 10:21:18 +01:00
Alex Moreno 294b6bf5be fix: update Jenkinsfile to remove specific end-to-end test files 2025-02-28 10:15:17 +01:00
Jose Antonio Tubau c450a6825c Merge pull request 'fix: refs: #8625 fixed agency and vehicle Fk and add select fields on create form' (!1503) from hotfix_8625_fixCreateNewRoute into master 
Reviewed-on: verdnatura/salix-front#1503
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 09:09:55 +00:00
Jose Antonio Tubau 38769d8b0a Merge branch 'master' into hotfix_8625_fixCreateNewRoute 2025-02-28 08:35:01 +00:00
Alex Moreno c0d77850ee test: skip failing test 2025-02-28 09:24:02 +01:00
Jose Antonio Tubau e9660b2687 refactor: rename agencyModeFk to agencyName and vehicleFk to vehiclePlateNumber in RouteList.vue 2025-02-28 09:00:23 +01:00
Alex Moreno 5873abadd4 fix: remove old end-to-end test files before building Docker image 2025-02-28 08:28:21 +01:00
Jose Antonio Tubau b9583ae238 Merge branch 'dev' into 7414-ticketHistoryChanges 2025-02-28 06:33:39 +00:00
Alex Moreno 82669f8abf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-28 07:04:33 +01:00
Pablo Natek 0d090b0c08 Merge pull request 'refactor: refs #6897 update component props and attributes for consistency and improved functionality' (!1508) from 6897-fixMinorIssues into test 
Reviewed-on: verdnatura/salix-front#1508
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 06:02:13 +00:00
Pablo Natek 773caeee6d Merge branch 'test' into 6897-fixMinorIssues 2025-02-28 05:06:46 +00:00
Javier Segarra 321e99f501 feat: add order for table 2025-02-27 19:14:21 +00:00
Jose Antonio Tubau 1c568227c2 refactor: replace select component with VnSelectWorker in RouteList.vue 2025-02-27 12:45:20 +01:00
Jose Antonio Tubau aea81e42de Merge branch 'dev' into 7414-ticketHistoryChanges 2025-02-27 10:54:37 +00:00
Jose Antonio Tubau 8c2bbe6469 Merge branch 'dev' into 8620-createTestE2ERouteAutonomous 2025-02-27 09:52:01 +00:00
Guillermo Bonet c3c8a78fd8 feat: refs #8348 Added grouping 2025-02-27 10:48:17 +01:00
Pablo Natek a95b87999f fix: refs #6897 prevent default event behavior in autocompleteExpense function 2025-02-27 10:35:15 +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