3023 Commits

Author	SHA1	Message	Date
Jon Elias	75a478ddc4	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-14 06:48:24 +00:00
Jon Elias	b16b87fadd	Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity	2024-06-14 08:47:27 +02:00
Jon Elias	c017493cb8	refactor: refs #5447 fixed filter if continent not selected	2024-06-14 08:47:25 +02:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Jorge Penadés	205e7d82a6	Merge branch 'dev' into 6598-getUserAcl	2024-06-11 07:31:15 +00:00
Jorge Penadés	c5889b2170	Merge branch 'dev' into 6273-fixRedirect	2024-06-11 07:16:59 +00:00
Jorge Penadés	01658ee100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-06-11 09:10:19 +02:00
Jorge Penadés	f9b688fc37	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:02:37 +00:00
Alex Moreno	0289c167ee	refactor: unnecessary computed	2024-06-11 08:30:18 +02:00
Alex Moreno	5e7ef68439	feat: simplify html	2024-06-11 08:22:26 +02:00
Javi Gallego	b83285000b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-11 08:03:41 +02:00
Javi Gallego	d847b33def	minor change	2024-06-11 08:03:35 +02:00
Jon Elias	2365ce6857	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-11 05:17:51 +00:00
Javier Segarra	fbecbd0c08	Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu	2024-06-10 17:10:05 +02:00
Jorge Penadés	992249c638	fix: refs #6273 redirect	2024-06-10 17:06:28 +02:00
William Buezas	c1df20a09b	Worker descriptor menu	2024-06-10 11:21:23 -03:00
Jorge Penadés	348310bc34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-10 15:37:08 +02:00
Jorge Penadés	a5b71ecebc	feat: refs #6273 delete prop	2024-06-10 15:32:38 +02:00
Jorge Penadés	a64cd6fa73	refactor: refs #6273 update locale	2024-06-10 15:21:28 +02:00
Javi Gallego	3f94eabc3d	feat: refs #7548 añado link grafana	2024-06-10 14:47:43 +02:00
Jorge Penadés	9eed6e55be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 14:24:25 +02:00
Jorge Penadés	5869ad220c	feat: refs #6273 wip: add locale	2024-06-10 14:17:22 +02:00
Jorge Penadés	5e96ed3bd3	fix: refs #6273 fix arrayData changed	2024-06-10 14:03:57 +02:00
Jorge Penadés	d81ce9fe95	feat: refs #6273 add test & improve form	2024-06-10 13:54:02 +02:00
Javi Gallego	0e0e351805	Merge branch 'dev' into 7548-ticketSummaryCollection	2024-06-10 10:53:33 +02:00
Javi Gallego	911ff376fd	Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev ... Reviewed-on: #421 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-10 08:16:57 +00:00