2293 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	fd0d0283a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-18 10:53:12 +01:00
Jon Elias	d365a36c7e	fixed useless variable	2024-03-18 09:51:30 +01:00
Jon Elias	fe7d370a0a	refactor: refs #6837 move travel search like other sections	2024-03-18 09:48:27 +01:00
Jorge Penadés	f0e414e160	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-18 09:47:06 +01:00
Jorge Penadés	5803b8392b	feat: refs #6951 clone ticket	2024-03-15 16:30:12 +01:00
William Buezas	dce974eba4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-15 10:20:46 -03:00
Jon Elias	8ebf4be807	refs: #6993 deleted useless files	2024-03-15 14:09:05 +01:00
Javier Segarra	de5260b563	Merge branch 'dev' into 6930_fix_bug	2024-03-15 13:09:01 +00:00
Alex Moreno	79b242f3a6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-03-15 14:08:30 +01:00
Alex Moreno	cb4ec856fd	refs #6905 fix css	2024-03-15 14:08:16 +01:00
Javier Segarra	55ef37584a	refs #6993 fix test front	2024-03-15 14:07:28 +01:00
Javier Segarra	63d195cbbf	refs #6930 perf: refactor destroy method	2024-03-15 13:21:26 +01:00
Jon Elias	a5441fb4a9	refs #6993 fix test front	2024-03-15 13:06:31 +01:00
Jon Elias	6ff8b7be34	refs #6993 fix conflicts	2024-03-15 12:57:16 +01:00
Jon Elias	4c63e2f5c1	merge	2024-03-15 12:54:14 +01:00
Jon Elias	2321ca6605	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination	2024-03-15 12:54:05 +01:00
Jon Elias	07cd07427e	refs #6993 remove depen	2024-03-15 12:50:05 +01:00
Jon Elias	ff5e09d315	refs #6993 fixed QTable behaviour	2024-03-15 12:45:15 +01:00
Javier Segarra	0d3d002baf	refs #6930 perf: replace label	2024-03-15 12:43:56 +01:00
Javier Segarra	445d95057a	refs #6930 feat: trycatchfinally logout	2024-03-15 12:42:08 +01:00
Alex Moreno	17df7e8b09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-us	2024-03-15 12:24:30 +01:00
Carlos Satorres	d8419a146a	refs #6905 fix userConfig	2024-03-15 10:48:02 +01:00
Alex Moreno	0fe0a6385b	hotFix(Readme): change bun to pnpm	2024-03-15 10:43:25 +01:00
Javier Segarra	26e54923de	Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!202) from 6930_scopedToken_Multimedia into dev ... Reviewed-on: #202 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-15 09:08:20 +00:00
Javier Segarra	efb3ae6e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia	2024-03-15 09:47:13 +01:00
Pablo Natek	a76d6dc781	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-15 06:53:59 +00:00
Javier Segarra	4f441ad5bc	Merge pull request 'HOTFIX vnlocation.spec' (!240) from hotfix_spec_vnlocation into test ... Reviewed-on: #240 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-15 06:18:29 +00:00
Jorge Penadés	dd91449818	feat: refs #5186 use global locales	2024-03-14 15:16:50 +01:00
Pablo Natek	077fa7e2a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles	2024-03-14 15:10:41 +01:00
Pablo Natek	00a47cd5b2	refactor(style): refs #7001 add style font vnTitle vnChip	2024-03-14 15:06:06 +01:00
Jorge Penadés	f39595087a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 15:00:16 +01:00
William Buezas	22c49d9cf7	resolve conflicts	2024-03-14 09:50:27 -03:00
Javier Segarra	278ebbe070	Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev ... Reviewed-on: #195 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 12:44:43 +00:00
Jon Elias	667359ed92	Merge branch 'dev' into 6993-HideAllPagination	2024-03-14 12:09:18 +00:00
Jon Elias	a968540635	refactor: #6993 set default QTable pagination, created quasar.defaults for standards	2024-03-14 13:06:02 +01:00
Kevin Martinez	8587d46943	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/pages/Route/Card/RouteSummary.vue	2024-03-14 08:05:51 -03:00
Javier Segarra	f1d21915eb	fix vnlocation.spec	2024-03-14 09:28:28 +00:00
Alex Moreno	78e3cff397	refs #7033 deploy: init version 2414	2024-03-14 09:08:27 +01:00
Alex Moreno	09e18dfc01	refs #7033 deploy(2412): dev to test	2024-03-14 09:07:34 +01:00
Jorge Penadés	0c012ed71a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 08:54:21 +01:00
Jon Elias	37a2c33f9f	refactor: #6993 set default QTable pagination	2024-03-14 08:51:26 +01:00
Alex Moreno	c39afd0b75	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-03-14 08:18:53 +01:00
Alex Moreno	1d401ed537	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-03-14 08:18:36 +01:00
Alex Moreno	7a75238695	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-03-14 08:16:15 +01:00
Alex Moreno	ab8e1fdc04	Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev ... Reviewed-on: #201 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 06:39:45 +00:00
William Buezas	f26d14e875	resolve conflicts	2024-03-13 12:57:41 -03:00
Javi Gallego	e1cf13076f	Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev ... Reviewed-on: #214 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-13 14:37:59 +00:00
Javi Gallego	4bc57d0287	Merge branch 'dev' into CambiosSolicitadosSuppliers	2024-03-13 14:37:06 +00:00
Javi Gallego	9e87365bd7	Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev ... Reviewed-on: #234 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-13 14:36:48 +00:00
Jorge Penadés	e793b3dd93	feat: refs #5186 use global locales	2024-03-13 15:06:02 +01:00