6449 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	8258fbb91e	refs #7767 remove onMounted	2024-10-14 13:24:12 +02:00
Carlos Satorres	b225f6a4c8	refs #7767 fix contractHolidays	2024-10-14 13:18:34 +02:00
Carlos Satorres	2edeb1043e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded	2024-10-14 10:24:49 +02:00
Javier Segarra	adbb745f0f	Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev ... Reviewed-on: #816 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 07:24:16 +00:00
Javier Segarra	914f6022be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra	2024-10-14 09:23:31 +02:00
Alex Moreno	55b9fb1a87	Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev ... Reviewed-on: #823 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 07:10:20 +00:00
Jon Elias	eebac7b36c	fix: fixed e2e test	2024-10-14 08:51:26 +02:00
Alex Moreno	64c8d264af	warmFix(TravelList): add daysOnward in travelFilter	2024-10-14 07:43:29 +02:00
Javier Segarra	f72761f36c	Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev ... Reviewed-on: #820 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-10 12:29:40 +00:00
Javier Segarra	2ff99d3faa	feat: define as global dense value	2024-10-10 13:56:14 +02:00
Javier Segarra	3dfb836f8e	revert: rollback compress spacestyle	2024-10-10 13:56:11 +02:00
Jorge Penadés	480f243205	Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev ... Reviewed-on: #748 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 07:20:25 +00:00
Jorge Penadés	00dc2c6edc	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:00 +00:00
Javier Segarra	6a79746080	test: fix TicketDescriptor	2024-10-08 13:18:51 +02:00
Javier Segarra	e0f60ed118	test: fix VnLocation	2024-10-08 11:07:05 +00:00
Alex Moreno	b6778aaf17	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-08 12:24:39 +02:00
Alex Moreno	3dad27e463	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-08 12:21:57 +02:00
Alex Moreno	6108a26e93	Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset into master ... Reviewed-on: #805 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-10-08 10:19:32 +00:00
Alex Moreno	d8a2cdc11c	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 10:16:14 +00:00
Carlos Satorres	68a54ebe22	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-08 09:26:35 +02:00
Carlos Satorres	0517b39c60	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front	2024-10-08 09:26:07 +02:00
Carlos Satorres	56fff55f71	fix: unnecessary property	2024-10-08 09:26:00 +02:00
Alex Moreno	bde739e7ef	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 06:50:16 +00:00
Jorge Penadés	1723331615	Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-07 16:35:00 +02:00
Guillermo Bonet	26b4110d22	Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc into dev ... Reviewed-on: #809 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 12:59:28 +00:00
Javier Segarra	a0da1b3f46	Merge pull request 'HOTFIX: VnImg zoom resolution missing property' (!811) from hotfix_vnImg_zoom_resolution into master ... Reviewed-on: #811 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 12:00:55 +00:00
Javier Segarra	43da6ea1b8	Merge branch 'master' into hotfix_vnImg_zoom_resolution	2024-10-07 12:00:12 +00:00
Guillermo Bonet	50eed83d05	feat: refs #7893 Requested changes	2024-10-07 13:50:19 +02:00
Javier Segarra	0ed9fdd55d	fix: refs VnImg zoom resolution missing property	2024-10-07 13:02:40 +02:00
Carlos Satorres	51e8d37e4b	Merge pull request 'hotfix: routePrice null' (!810) from hotfix-routePrice into master ... Reviewed-on: #810 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 10:37:11 +00:00
Carlos Satorres	e396cd0cac	hotfix: routePrice null	2024-10-07 12:16:32 +02:00
Guillermo Bonet	a6944561de	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 11:32:03 +02:00
Guillermo Bonet	c3eaab44ed	Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc	2024-10-07 11:31:18 +02:00
Guillermo Bonet	178fa8cd21	feat: refs #7893 Requested changes	2024-10-07 11:31:16 +02:00
Alex Moreno	b1385cf08a	Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations into dev ... Reviewed-on: #807 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-10-07 08:09:12 +00:00
Guillermo Bonet	f98739f0ed	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 08:03:26 +00:00
Guillermo Bonet	4f3e7e2630	feat: refs #7893 Added waste recalc section	2024-10-07 10:03:05 +02:00
Carlos Satorres	f22809d609	Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master ... Reviewed-on: #808 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 07:54:07 +00:00
Carlos Satorres	27e6dd5bf1	Merge branch 'master' into 6898-hotfixSupplierAgency	2024-10-07 07:51:02 +00:00
Carlos Satorres	5d65d3e20c	refs #6898 hotfix agency	2024-10-07 09:48:57 +02:00
Alex Moreno	5af6c89c1a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset	2024-10-07 09:17:19 +02:00
Alex Moreno	ef5ae0f723	refactor(ticketNotes): translations	2024-10-07 09:16:07 +02:00
Alex Moreno	b8407140f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:02:01 +02:00
Alex Moreno	426b7254d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:01:57 +02:00
Jorge Penadés	120f96fedc	Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev ... Reviewed-on: #719 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-07 06:41:35 +00:00
Jorge Penadés	355c84ad06	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:07 +00:00
Alex Moreno	9df5857b21	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-07 08:35:13 +02:00
Alex Moreno	34a40dd87c	fix(VnPaginate): use default value	2024-10-07 08:24:53 +02:00
Javier Segarra	c9467b5286	Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master ... Reviewed-on: #799 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-05 09:02:46 +00:00
Javier Segarra	04b2a4d9ce	perf: clean warnings	2024-10-05 00:31:41 +02:00