2104 Commits

Author	SHA1	Message	Date
Javier Segarra	bf08ca7655	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 06:25:14 +00:00
Alex Moreno	1206cc2292	warmFix: duplicated button after merge min	2024-04-24 08:11:33 +02:00
Javier Segarra	f959b5dc37	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 11:57:22 +00:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
Jon Elias	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00:00
Jon Elias	f21fcc8959	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 10:15:56 +02:00
Jon Elias	fe600d9318	refactor: refs #7239 requested changes	2024-04-23 10:15:54 +02:00
Javier Segarra	62c66ff952	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:04:13 +00:00
Alex Moreno	9cb662b6f5	Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar	2024-04-23 07:22:34 +00:00
Jorge Penadés	498b8b3315	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData	2024-04-23 08:39:33 +02:00
Javier Segarra	6018d51642	perf: #7190 remove comments	2024-04-23 07:56:07 +02:00
Javier Segarra	74eec098ac	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-23 07:49:35 +02:00
Alex Moreno	20ec141237	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-23 07:39:15 +02:00
Jon Elias	781e863aca	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 05:16:34 +00:00
Jon Elias	87ce1f0217	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 07:15:41 +02:00
Jon Elias	4ddcbaeacd	refactor: refs #7239 fixed errors	2024-04-23 07:15:39 +02:00
Jorge Penadés	3abc504158	fix: unit test	2024-04-22 16:35:34 +02:00
Alex Moreno	952d5bf543	fix(VnNotes): refs #6336 VnAvatar	2024-04-22 15:03:10 +02:00
Alex Moreno	72deeab2ef	Merge branch 'dev' into warmFix_hasMoreData	2024-04-22 13:01:28 +00:00
William Buezas	c9767e7b1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges	2024-04-22 09:45:01 -03:00
William Buezas	7dac6ba910	Remove unused imports	2024-04-22 09:02:35 -03:00
William Buezas	64fc02e33b	Fix supplier consumption disabled buttons	2024-04-22 09:00:57 -03:00
Jon Elias	2e493258fd	Merge branch 'dev' into 7239-changeTranslations	2024-04-22 11:19:15 +00:00
Jon Elias	dd74c7d507	refactor: refs #7239 changed translations	2024-04-22 13:17:22 +02:00
Jorge Penadés	1f391dc49b	fix: skip	2024-04-22 13:17:05 +02:00
Jorge Penadés	80844e7869	fix: hasMoreData	2024-04-22 12:53:09 +02:00
Alex Moreno	4a5285358c	fix(VnNotes): refs #6336 restore index in key	2024-04-22 09:46:40 +02:00
Alex Moreno	918ce0dc86	fix(VnNotes): refs #6336 remove index in key	2024-04-22 09:38:38 +02:00
Jorge Penadés	9a3f714290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData	2024-04-22 08:57:26 +02:00
Alex Moreno	99af402281	fix(VnNotes): refs #6336 fix v-for key	2024-04-22 08:42:38 +02:00
Alex Moreno	3eb5041bf5	fix: refs #6590 remove unnecessary import	2024-04-22 07:50:34 +02:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +02:00
Javier Segarra	2b24e18f75	FEAT: SETiNTERVAL WITH RENEWpERIOD	2024-04-22 07:37:35 +02:00
Javier Segarra	edd1b66110	fix: merge toDateHourMin	2024-04-21 16:09:21 +02:00
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
Alex Moreno	ae2737673d	fix: hasMoreData	2024-04-19 14:43:38 +02:00
Alex Moreno	c638209f0e	fix: hasMoreData	2024-04-19 14:39:20 +02:00
Javier Segarra	aecea5f273	refs #7190 feat: renewToken	2024-04-19 12:26:43 +02:00
Javier Segarra	fb26219354	refs #7190 feat: useTokenConfig	2024-04-19 12:09:04 +02:00
Alex Moreno	6db5c56f5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-19 09:36:10 +02:00
Jon Elias	8fadccce92	Merge branch 'dev' into 7139-changeColumnsInRouteSummary	2024-04-18 12:48:02 +00:00
William Buezas	b52b70041c	resolve pnpm lock conflicts and change some colors	2024-04-18 08:33:23 -03:00
Guillermo Bonet	9b5e8024be	Merge branch 'dev' into 6724-disableEntryBooked	2024-04-18 11:18:22 +00:00
Javier Segarra	82937a103d	Merge branch 'dev' into 7180_bug_supplierListScroll	2024-04-18 11:06:33 +00:00
Guillermo Bonet	7eb9666c7c	Merge branch 'dev' into 6724-disableEntryBooked	2024-04-18 11:06:30 +00:00
Jon Elias	f3b893de67	Merge branch 'dev' into 7139-changeColumnsInRouteSummary	2024-04-18 11:06:17 +00:00
Jon Elias	1f0394b5fc	refactor: refs #7139 fixed error in translation	2024-04-18 12:45:45 +02:00
Jon Elias	c60558420f	fix: refs #6425 fixed vitest config to avoid testing problems	2024-04-18 12:38:43 +02:00
Javier Segarra	7f63ea4e1c	Actualizar src/composables/useArrayData.js	2024-04-18 09:37:01 +00:00
Javier Segarra	846c85ed1a	Actualizar src/components/ui/VnPaginate.vue	2024-04-18 09:36:24 +00:00