2106 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	7658573ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-03-21 12:23:45 +01:00
Jon Elias	63c6b523fb	refactor: refs #6425 new translation proposal	2024-03-21 12:14:54 +01:00
Javier Segarra	166e40833d	Merge pull request 'feature/InvoicesOutCorrections' (!232) from hyervoni/salix-front-mindshore:feature/InvoicesOutCorrections into dev ... Reviewed-on: #232 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-20 13:34:34 +00:00
William Buezas	cb51edff04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-20 10:32:47 -03:00
Alex Moreno	02574ec42d	Merge pull request 'test(VnPaginate) fix' (!246) from fix_VnPaginate_paginate into dev ... Reviewed-on: #246 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-03-20 07:23:17 +00:00
William Buezas	2ea6fd2ea6	Change vnconfirm export name	2024-03-19 13:50:15 -03:00
Alex Moreno	9094ae8c88	test(VnPaginate) fix	2024-03-18 15:02:50 +01:00
Alex Moreno	e4cbaf303e	Merge pull request '#6930 - FIX bug logout' (!242) from 6930_fix_bug into dev ... Reviewed-on: #242 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-18 12:35:01 +00:00
Alex Moreno	4b03405474	Merge branch 'dev' into 6930_fix_bug	2024-03-18 12:33:20 +00:00
Alex Moreno	62253e2282	refs #6546 test(VnPaginate) skip	2024-03-18 13:33:02 +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
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
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
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	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
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
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
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
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
Kevin Martinez	77e29a2b87	Fix tickets feedback	2024-03-12 21:26:17 -03:00
Kevin Martinez	e4553659cf	Update translation from population to city	2024-03-12 21:23:46 -03:00
William Buezas	ff0b0c8131	Remove innecesary prop	2024-03-12 12:38:44 -03:00
William Buezas	06fa4aebc5	add invoice out list download icon	2024-03-12 11:40:06 -03:00
William Buezas	bd5eb1a1c3	remove assignPDA translation	2024-03-12 11:34:38 -03:00
William Buezas	632049c13b	Assign button change	2024-03-12 11:31:32 -03:00
William Buezas	fff5e1849e	Delete unused form	2024-03-12 09:59:27 -03:00
William Buezas	433843ea09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers	2024-03-12 08:16:40 -03:00
William Buezas	dad2711311	fix translation	2024-03-12 08:13:27 -03:00
William Buezas	029fc043de	Change title translation	2024-03-12 08:08:20 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03:00
Javier Segarra	63f00c24d7	Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev ... Reviewed-on: #233 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-03-11 11:13:05 +00:00
Kevin Martinez	5011fd5f83	Create date and time utility	2024-03-10 21:41:36 -03:00
William Buezas	049e3c722a	Fix translation	2024-03-08 15:09:28 -03:00
William Buezas	ed99aea4a3	Finish create manual invoice popup form	2024-03-08 15:05:11 -03:00