9772 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	5325095297	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance	2025-02-07 11:39:36 +01:00
Jorge Penadés	de6020626f	Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev ... Reviewed-on: #1346 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 09:03:52 +00:00
Jorge Penadés	05f6e1ec20	Merge branch '7119-showCountryName' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName	2025-02-07 10:02:46 +01:00
Jorge Penadés	0adb86d4f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName	2025-02-07 10:02:37 +01:00
Javier Segarra	86b77c2022	Merge pull request '#7601 - Different agency fot future tickets' (!1342) from 7601_futureAgency into dev ... Reviewed-on: #1342 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 08:36:18 +00:00
Javier Segarra	0901c57b12	Merge branch 'dev' into 7601_futureAgency	2025-02-07 08:32:53 +00:00
Carlos Satorres	154a893580	Merge pull request 'fix: refs #6426 create constants' (!1228) from 6426-refactorConstants into dev ... Reviewed-on: #1228 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 08:22:54 +00:00
Carlos Satorres	780e7839f4	Merge branch 'dev' into 6426-refactorConstants	2025-02-07 08:21:56 +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
Javier Segarra	2550add549	Merge branch 'dev' into 7601_futureAgency	2025-02-07 07:07:48 +00: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
Alex Moreno	fc44424dda	Merge branch 'dev' into 7119-showCountryName	2025-02-07 06:00:54 +00: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
Jorge Penadés	5e17af2fae	feat: refs #7119 show country name	2025-02-06 16:19:38 +01:00
Javier Segarra	e8a90faa62	feat: add agency icon	2025-02-06 12:33:26 +00:00
Alex Moreno	07eacdcebf	fix: refs #6426 constants	2025-02-06 12:42:00 +01:00
Carlos Satorres	117ce937fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants	2025-02-06 11:58:01 +01:00
Carlos Satorres	64a52e0183	fix: refs #6426 outLayout	2025-02-06 11:57:27 +01: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
Carlos Satorres	5d7bfec177	Merge branch '6426-refactorConstants' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants	2025-02-06 09:53:13 +01:00
Carlos Satorres	ded1dae481	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants	2025-02-06 09:53:09 +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
Carlos Satorres	502f41993a	Merge branch 'dev' into 6426-refactorConstants	2025-02-06 08:47:50 +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
Carlos Satorres	5cb2b326f1	Merge branch 'dev' into 6426-refactorConstants	2025-02-05 15:08:25 +00: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