13082 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	767a6302e1	Merge pull request 'refactor: update TravelSummary and TravelList components for improved data fetching and summary view' (!1658) from hotFixTravelSummaryDialog into master ... Reviewed-on: #1658 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-31 10:56:40 +00:00
Alex Moreno	2f6b98a0bf	fix: refs #8449 update data-key attribute in VnTableFilter and related components	2025-03-31 12:50:32 +02:00
Alex Moreno	519ae66226	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnCard_url	2025-03-31 12:39:05 +02:00
Alex Moreno	497eb3a8bb	refactor(VnLog): refs #8449 clear filters when has userParams	2025-03-31 12:35:13 +02:00
Pablo Natek	c3d51259c4	Merge branch 'master' into hotFixTravelSummaryDialog	2025-03-31 10:31:24 +00:00
Pablo Natek	ba2084e906	refactor: update TravelSummary and TravelList components for improved data fetching and summary view	2025-03-31 12:30:16 +02:00
Jose Antonio Tubau	1f41e3c8d1	Merge branch 'dev' into 8717-reviewAndFixAgencySection	2025-03-31 10:17:23 +00:00
Alex Moreno	5066cd8179	Merge branch 'dev' of https: refs #8449//gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter	2025-03-31 11:44:02 +02:00
Alex Moreno	ae5465687e	Merge branch 'dev' into enable-parallel-x2	2025-03-31 09:40:58 +00:00
Jon Elias	801e9687f7	Merge branch 'dev' into 7995-CreateHasAcl	2025-03-31 09:32:47 +00:00
Jose Antonio Tubau	c205693131	Merge pull request '8440-createVehicleNotes' (!1638) from 8440-createVehicleNotes into dev ... Reviewed-on: #1638 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-03-31 09:01:35 +00:00
Jose Antonio Tubau	2bd0e88e3b	Merge branch 'dev' into 8440-createVehicleNotes	2025-03-31 08:39:35 +00:00
Javier Segarra	8c75ec41d8	Merge pull request '#8667: Modified ClientPayment' (!1622) from 8667-FixClientNewPayment into dev ... Reviewed-on: #1622 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-31 08:17:33 +00:00
Alex Moreno	cad78aedd0	Merge branch 'dev' into enable-parallel-x2	2025-03-31 08:11:32 +00:00
Jon Elias	6cee67733d	Merge branch 'dev' into 8667-FixClientNewPayment	2025-03-31 07:54:41 +00:00
Pablo Natek	6dad310665	Merge pull request 'fix: adjust styles in ExtraCommunity.vue for better layout and readability' (!1655) from fixOverFlow into dev ... Reviewed-on: #1655 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-31 07:54:26 +00:00
Javier Segarra	ddfed3a59d	Merge branch 'master' into hotfix_remove_reserved	2025-03-31 07:51:58 +00:00
Jon Elias	f8cc7b95ab	refactor: refs #7995 modified hasAcl function	2025-03-31 09:51:40 +02:00
Alex Moreno	36f142800f	refactor: simplify data fetching logic in VnCard.vue	2025-03-31 09:51:36 +02:00
Pablo Natek	5b23a3ebc6	Merge branch 'dev' into fixOverFlow	2025-03-31 07:26:10 +00:00
Alex Moreno	16cb224926	Merge branch 'dev' into enable-parallel-x2	2025-03-31 06:54:24 +00:00
Javi Gallego	9fdc8a1042	fix: update state color for 'managed' to 'loses' in ClaimList.vue	2025-03-31 08:51:37 +02:00
Pablo Natek	668745981f	Merge pull request 'fix: update filter in TravelCard to include route parameter' (!1651) from hotFix_travelCard_addWhere into master ... Reviewed-on: #1651 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-03-31 06:36:19 +00:00
Jose Antonio Tubau	2d03b3a0b7	Merge branch 'dev' into 8440-createVehicleNotes	2025-03-31 06:34:06 +00:00
Javier Segarra	d60d7da33c	fix: improve monitorClient.department	2025-03-28 14:31:11 +01:00
Alex Moreno	ea59cf8b0d	Merge branch 'dev' into enable-parallel-x2	2025-03-28 13:17:47 +00:00
Alex Moreno	17821917ea	Merge branch 'master' into hotFix_travelCard_addWhere	2025-03-28 13:17:34 +00:00
Jorge Penadés	6adf7a91cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl	2025-03-28 14:06:20 +01:00
Jorge Penadés	74a7b39108	Merge pull request 'refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests' (!1645) from 8718-hotfix-vnAccount into master ... Reviewed-on: #1645 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-28 13:04:29 +00:00
Javier Segarra	fe2024c26a	Merge branch 'master' into 8718-hotfix-vnAccount	2025-03-28 12:28:15 +00:00
Jose Antonio Tubau	033fe3375f	Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection	2025-03-28 13:20:04 +01:00
Jose Antonio Tubau	4fbcb82234	fix: refs #8717 update AgencyCard to include filter by agency ID and correct locale key casing	2025-03-28 13:20:02 +01:00
Benjamin Esteve	c516ae1e12	Merge pull request 'refactor: refs #8673 replace VnPopup with inline display of evaNotes in ExtraCommunity.vue' (!1633) from 8673-viewEntryNotesField into dev ... Reviewed-on: #1633 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-03-28 11:55:33 +00:00
Benjamin Esteve	89d9c22c6a	Merge branch 'dev' into 8673-viewEntryNotesField	2025-03-28 11:34:12 +00:00
Javier Segarra	cce3a0cef8	Merge branch 'test' into warmfix_monitorClients	2025-03-28 12:03:29 +01:00
Javier Segarra	50fb8a31a6	test: fix test	2025-03-28 12:03:15 +01:00
Alex Moreno	e05d3140a3	Merge branch 'dev' into 8449-vnLogFilter	2025-03-28 10:55:43 +00:00
Pablo Natek	ff30ca898c	fix: adjust styles in ExtraCommunity.vue for better layout and readability	2025-03-28 11:07:34 +01:00
Pablo Natek	1a1a859edc	Merge branch 'master' into hotFix_travelCard_addWhere	2025-03-28 09:58:45 +00:00
Javier Segarra	a49c8891a7	fix: params.departmentFk i18n and ticketFilter.groupedStates	2025-03-28 10:22:08 +01:00
Javier Segarra	ec723a884b	fix: vnMoreOptions label	2025-03-28 09:52:23 +01:00
Benjamin Esteve	feec9a7100	Merge branch 'dev' into 8673-viewEntryNotesField	2025-03-28 08:36:52 +00:00
Alex Moreno	ea694a606a	Merge pull request 'feat: refs #8534 implement navigation and state query guards for improved routing control' (!1621) from 8534-wait_queries into dev ... Reviewed-on: #1621 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-28 08:32:16 +00:00
Jon Elias	c03a56f69f	feat: refs #7995 added hasAcl to check only one acl	2025-03-28 09:28:24 +01:00
Benjamin Esteve	cc41c90d8e	Merge branch 'dev' into 8673-viewEntryNotesField	2025-03-28 07:39:20 +00:00
Alex Moreno	7648fc6743	refactor: refs #8534 simplify stateQueryGuard usage and improve test structure	2025-03-28 08:06:51 +01:00
Alex Moreno	5c2c761eb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries	2025-03-28 07:18:51 +01:00
Javier Segarra	687bd54e64	refactor: refs #8006 update ESLint rules and disable unused rules	2025-03-28 02:27:46 +01:00
Javier Segarra	0b614f15d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8006_eslint_rules	2025-03-28 02:21:32 +01:00
Javier Segarra	2a3e072b1b	feat: add departmentFk to user data and filter clients by department	2025-03-28 01:25:38 +01:00