Commit Graph

12947 Commits

Author SHA1 Message Date
Jorge Penadés 07a36b4e53 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-04-02 15:09:56 +02:00
Alex Moreno 00e1e4441c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:21:02 +02:00
Alex Moreno 6fd01a4d09 fix: remove duplicate departmentFk entries in CustomerFilter.vue
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:20:58 +02:00
Alex Moreno a4b710352d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head Build queued... Details
2025-04-02 14:18:19 +02:00
Alex Moreno 4821390f22 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-04-02 14:18:12 +02:00
Pablo Natek 8b24874f72 Merge pull request 'refactor: improve layout and styling in ExtraCommunity.vue' (!1669) from warmFixExtraComunityFieldsDisplay into test
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 12:18:08 +00:00
Alex Moreno 425e2adcdb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-04-02 14:17:44 +02:00
Pablo Natek 6debb64b2b test: skip VnShortcuts and WorkerList test suites
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:52:51 +02:00
Alex Moreno 861bbb1574 Merge pull request 'chore: update Cypress parallel test execution to use 2 instances' (!1648) from enable-parallel-x2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1648
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-02 10:36:02 +00:00
Alex Moreno 0af42130c1 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:07:19 +00:00
Pablo Natek 74033a7bdf refactor: improve layout and styling in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 11:51:03 +02:00
Javier Segarra 87e56d9ff1 fix: customer missing i18n
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 11:39:02 +02:00
Javier Segarra 22b57f850c Merge pull request 'fix_vnLinkPhone' (!1659) from fix_vnLinkPhone into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1659
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 07:53:14 +00:00
Javier Segarra 046b6f8f28 Merge pull request 'fix: fixed CustomerTicket table order' (!1661) from hotfix-CustomerTicketOrder into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1661
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-02 05:47:20 +00:00
Javier Segarra a43ade9852 Merge branch 'master' into hotfix-CustomerTicketOrder
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 13:33:57 +00:00
Alex Moreno 9be4cdccc0 Merge pull request 'refactor: remove keepData property from components and update related logic' (!1664) from warmFix_remove_keepData into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1664
2025-04-01 13:22:09 +00:00
Javier Segarra f02fa732ee feat: remove unused vnLinkPhone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 15:10:49 +02:00
Alex Moreno 0a0e4dfca7 Merge branch 'test' into warmFix_remove_keepData
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 12:59:46 +00:00
Javier Segarra 8849b9ed97 Merge branch 'dev' into fix_vnLinkPhone
gitea/salix-front/pipeline/pr-dev Build queued... Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 14:52:22 +02:00
Javier Segarra 40cfe2a5cc style: add ellipsis class to CardSummary 2025-04-01 14:52:05 +02:00
Javier Segarra 02a78c662b perf: handle VnLinkMail and VnEmail 2025-04-01 14:51:49 +02:00
Javier Segarra 588876952a fix: customerSummary 2025-04-01 14:51:24 +02:00
Alex Moreno 3c4cbf82d2 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 12:28:20 +00:00
Alex Moreno c15e4dcf32 Merge pull request 'fix: simplify data fetching logic in VnCard.vue' (!1656) from fix_vnCard_url into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1656
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:27:37 +00:00
Jon Elias da21c0aad6 Merge pull request '#7995: Added hasAcl to check only one acl' (!1654) from 7995-CreateHasAcl into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1654
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:24:34 +00:00
Alex Moreno 0863df25fe Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:07:05 +00:00
Alex Moreno c09254d204 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 11:04:15 +00:00
Alex Moreno 06e5188146 refactor: remove keepData property from components and update related logic
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 13:02:49 +02:00
Jon Elias 26861e92b6 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:01:11 +00:00
Alex Moreno fb3c015f89 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:31 +02:00
Alex Moreno 590afaba93 fix: update condition for rendering QChip in VnOrder component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:26 +02:00
Jon Elias 3ddc6dc310 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 10:13:47 +00:00
Alex Moreno 79fbe2cc72 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:57:35 +00:00
Alex Moreno e6e4b49d44 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 09:57:20 +00:00
Alex Moreno c9416b5286 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:09 +02:00
Alex Moreno da148c5435 test: skip invoice deletion test and add spinner waits in VnShortcuts
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:05 +02:00
Jon Elias 27ec560fc5 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:31:33 +00:00
Javier Segarra 49fafa2b34 Merge pull request 'hotfix_ticketSale_handle_notifications' (!1660) from hotfix_ticketSale_handle_notifications into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1660
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-01 09:20:32 +00:00
Alex Moreno 246e4429bd refactor: update getArrayData function to accept entityId for improved data fetching
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-01 11:04:36 +02:00
Javier Segarra 98a4ac450d Merge branch 'master' into hotfix_ticketSale_handle_notifications
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 08:55:26 +00:00
PAU ROVIRA ROSALENY 35886999e4 fix: rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:54:41 +00:00
PAU ROVIRA ROSALENY 79fdaffbc8 fix: fixed CustomerTicket table order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:42:30 +00:00
Jon Elias 8c9c156817 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:34:39 +02:00
Jon Elias b00d89a4be perf: refs #7995 has acl function 2025-04-01 09:34:38 +02:00
Jorge Penadés e679282e57 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:22:14 +02:00
Alex Moreno 044c607405 chore: update version to 25.16.0 in package.json
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 08:32:58 +02:00
Jon Elias 9f05984e80 Merge pull request 'Hotfix[CustomerAddress]: Fixed buttons disabled when there are no changes' (!1641) from Hotfix-CustomerAddress into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 06:08:11 +00:00
Alex Moreno c4f895e060 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:39:06 +00:00
Alex Moreno 8e66be1874 Merge branch 'dev' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit is unstable Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:38:57 +00:00
Alex Moreno 40d59846fa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 07:28:11 +02:00