9739 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b8fd0fac9e	Merge branch 'dev' into 7414-ticketHistoryChanges	2025-02-07 07:21:43 +00:00
Alex Moreno	89df2e837c	Merge pull request 'refactor: #8322 changed supplier component to use VnSection/VnCardBeta' (!1216) from 8322-Supplier into dev ... Reviewed-on: #1216 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:20:47 +00:00
Alex Moreno	c72d4e9f04	fix: refs #8322 supplier use cardBeta correctly	2025-02-07 08:19:51 +01:00
Alex Moreno	1a420abfb2	Merge branch 'dev' of https: refs #8322//gitea.verdnatura.es/verdnatura/salix-front into 8322-Supplier	2025-02-07 07:39:47 +01:00
Javier Segarra	4994a94369	Merge pull request '#7058 LeftMenu vitest' (!1153) from 7058_leftMenu_vitest into dev ... Reviewed-on: #1153 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-02-06 21:45:16 +00:00
Javier Segarra	48e40cdc46	Merge branch 'dev' into 7058_leftMenu_vitest	2025-02-06 21:44:27 +00:00
Alex Moreno	063ac0cb7b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-06 11:00:10 +01:00
Alex Moreno	671018ea2e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-06 10:59:30 +01:00
Jorge Penadés	63a8f0f3c7	Merge pull request '#6919 syncData' (!941) from 6919-syncData into dev ... Reviewed-on: #941 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-06 09:39:48 +00:00
Jorge Penadés	f9ba0642e1	Merge pull request '#7524 dynamic fetch' (!1339) from 7524-hotfix-removeLimit into master ... Reviewed-on: #1339 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 09:32:44 +00:00
Jorge Penadés	f991aa0aa8	Merge branch '6919-syncData' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData	2025-02-06 10:32:02 +01:00
Jorge Penadés	848d00a8b3	Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData	2025-02-06 10:32:00 +01:00
Jorge Penadés	6732effe0c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-removeLimit	2025-02-06 10:30:16 +01:00
Alex Moreno	c6758c3346	Merge pull request 'fix: use userFilter to keep includes' (!1340) from hotFix_use_userFilter into master ... Reviewed-on: #1340 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 09:26:02 +00:00
Jorge Penadés	85c4d79443	Merge pull request '#7119 add VehicleList page and routing configuration' (!1129) from 7119-createVehicle into dev ... Reviewed-on: #1129 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-06 09:24:15 +00:00
Jorge Penadés	f37294f229	Merge branch '7119-createVehicle' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle	2025-02-06 10:20:43 +01:00
Jorge Penadés	017f435da6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle	2025-02-06 10:20:29 +01:00
Alex Moreno	ae36d676f5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-06 10:13:40 +01:00
Alex Moreno	a1555a4c54	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-06 10:13:36 +01:00
Alex Moreno	ab2d3fc4dc	fix: use userFilter to keep includes	2025-02-06 10:12:52 +01:00
Jorge Penadés	80337c61df	fix: refs #7524 dynamic fetch	2025-02-06 10:09:30 +01:00
Alex Moreno	a88696d590	Merge pull request 'fix(VnLog): load filters' (!1338) from hotFix_VnLog_filters into master ... Reviewed-on: #1338 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 08:48:26 +00:00
Alex Moreno	2ed9323f0f	fix(VnLog): load filters	2025-02-06 08:23:46 +01:00
Javier Segarra	a06cfa12a4	Merge pull request 'perf: keyshortcut directive' (!1315) from improve_shortcut_directive into dev ... Reviewed-on: #1315 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-06 07:14:22 +00:00
Javier Segarra	841195eca0	Merge branch 'dev' into improve_shortcut_directive	2025-02-05 22:06:08 +00:00
Javier Segarra	698edfbe72	feat: refs #7058 expect parent	2025-02-05 23:03:43 +01:00
Javier Segarra	97dfeca20d	fix: refs #7058 remove comment	2025-02-05 23:00:23 +01:00
Javier Segarra	b5b52dcda0	Merge branch 'dev' into 7058_leftMenu_vitest	2025-02-05 12:56:00 +00:00
Javier Segarra	7ece059610	test: refs #7058 clean comments	2025-02-05 13:55:47 +01:00
Javier Segarra	fcdc69d7c8	test: refs #7058 pass both tests	2025-02-05 13:48:29 +01:00
Alex Moreno	a338dbed70	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-05 13:48:06 +01:00
Alex Moreno	676ce400ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-05 13:47:58 +01:00
Alex Moreno	1b52468e14	fix: translation	2025-02-05 13:47:44 +01:00
Jose Antonio Tubau	3aa5bdac92	Merge pull request 'feat: refs #8304 added remove option to operator' (!1195) from 8304-workerChangesAndFixes into dev ... Reviewed-on: #1195 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-05 12:25:26 +00:00
Jon Elias	883eb7d57a	Merge pull request 'Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334)' (!1335) from warmfix_ticketSummary_width into test ... Reviewed-on: #1335 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-05 12:24:58 +00:00
Jose Antonio Tubau	c6cf2ed144	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-02-05 12:23:23 +00:00
Javier Segarra	cf7bcdae7a	Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334) ... Reviewed-on: #1334 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-05 12:21:39 +00:00
Javier Segarra	c8943e43fd	Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334) from Fix-MonitorTicketSummaryDialog into dev ... Reviewed-on: #1334 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-05 12:19:14 +00:00
Javier Segarra	b0b04ad017	Merge branch 'dev' into Fix-MonitorTicketSummaryDialog	2025-02-05 12:18:28 +00:00
Javier Segarra	0d2aada01f	Merge branch 'dev' into improve_shortcut_directive	2025-02-05 12:18:00 +00:00
Jon Elias	4848a89ca2	fix: fixed summary dialog width	2025-02-05 13:17:31 +01:00
Alex Moreno	2eb38382f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-05 12:16:02 +01:00
Alex Moreno	65b5094e23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-05 12:15:56 +01:00
Alex Moreno	5696a44c1b	fix: empty order	2025-02-05 12:15:30 +01:00
Alex Moreno	5078559668	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-05 12:04:33 +01:00
Alex Moreno	a25744c4a4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-05 12:04:16 +01:00
Alex Moreno	6e8f2754e5	fix: empty order	2025-02-05 12:00:34 +01:00
Alex Moreno	82cc153c98	fix: empty order	2025-02-05 12:00:19 +01:00
Alex Moreno	93ece4bf07	fix: empty order	2025-02-05 11:58:30 +01:00
Alex Moreno	4b66a8dea5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-05 11:52:04 +01:00