4388 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	92531216d1	Merge pull request '7565-testToMaster' (!431) from 7565-testToMaster into master ... Reviewed-on: #431 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-11 06:32:59 +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	83a4e9c75f	Merge branch 'dev' into 6739-invoiceOut	2024-06-11 05:18:59 +00: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
Alex Moreno	1b82ca9243	feat: add changelog	2024-06-10 15:55:22 +02: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	9bcfd5c58a	Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev ... Reviewed-on: #347 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 13:34:59 +00: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	9c72597c2c	fix: refs #6273 tests	2024-06-10 14:42:41 +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
Alex Moreno	1dd1a67657	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-10 13:15:17 +02:00
Alex Moreno	ed07b4d620	fix(url): redirect	2024-06-10 13:14:24 +02:00
Jon Elias	15bb9f596c	Merge branch 'dev' into 6464-fixNegativeBases	2024-06-10 10:00:42 +00:00
Jon Elias	4b2d977542	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-10 11:59:34 +02:00
Alex Moreno	9db390e904	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-10 11:58:05 +02:00
Alex Moreno	128904970b	fix(url): filter	2024-06-10 11:53:47 +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
Jon Elias	aa945df5f9	Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity	2024-06-10 09:39:04 +02:00
Jon Elias	cbd3ab3da2	refactor: refs #5447 refactor filters	2024-06-10 09:39:03 +02:00
Jon Elias	e6577d402a	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-10 07:29:29 +00:00
Jon Elias	20a07a90e8	Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity	2024-06-10 09:28:40 +02:00
Jon Elias	83d56e5d32	refactor: refs #5447 changed warehouse out filter behavior	2024-06-10 09:28:38 +02:00
Alex Moreno	bbf847e1a0	feat(url): sepate filters	2024-06-10 09:19:42 +02:00
Alex Moreno	aa2601ac45	feat(WorkerFormation): add columnFilter	2024-06-10 09:15:17 +02:00
Jorge Penadés	049783b16c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 08:58:10 +02:00
Jon Elias	deca90c7ea	Merge pull request '#7003 new data order in section' (!398) from 7003-fixedPriceOrder into dev ... Reviewed-on: #398 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 05:14:53 +00:00
Jon Elias	f3a28edb5e	Merge branch 'dev' into 7003-fixedPriceOrder	2024-06-10 05:12:28 +00:00
Jon Elias	f7fb23e869	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-10 05:10:44 +00:00
Alex Moreno	04f92071fb	Merge branch 'dev' into 6739-invoiceOut	2024-06-10 05:06:43 +00:00
William Buezas	91e0eb636f	resolve conflicts	2024-06-07 10:51:00 -03:00
Jorge Penadés	b68547ac1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 15:43:17 +02:00
William Buezas	bf3c146317	resolve conflicts	2024-06-07 10:24:11 -03:00
Alex Moreno	2bdfc90241	build: increase version	2024-06-07 14:56:39 +02:00
William Buezas	fa4a18fbbb	make account samba work again	2024-06-07 09:46:04 -03:00
William Buezas	1e67a0feca	Make AccountLdap work again	2024-06-07 09:35:36 -03:00
Jorge Penadés	695dd36c1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 14:23:26 +02:00
Jorge Penadés	59b85f24ea	fix: refs #6273 console error	2024-06-07 14:19:10 +02:00
Jorge Penadés	8d89fc2d90	feat: refs #6273 set payMethod to 0	2024-06-07 14:08:18 +02:00