10304 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	ee582b52b4	Merge pull request 'fix: refs #6943 rollback' (!1420) from 6943-fixVnCardConflicts into dev ... Reviewed-on: #1420 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 09:34:18 +00:00
Jorge Penadés	a766ba1633	fix: refs #6943 rollback	2025-02-18 10:22:26 +01:00
Guillermo Bonet	a7a592505b	Merge branch 'test' into dev	2025-02-18 10:13:59 +01:00
Guillermo Bonet	a3c91d702d	Merge branch 'master' into test	2025-02-18 10:13:46 +01:00
Guillermo Bonet	79d29fc071	Merge pull request 'fix: refs #8225 update email verification condition in WorkerDescriptorMenu' (!1419) from 8225-hotfix-condition into master ... Reviewed-on: #1419 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 09:13:02 +00:00
Jorge Penadés	ced34ccec3	fix: refs #8225 update email verification condition in WorkerDescriptorMenu	2025-02-18 10:08:28 +01:00
Javier Segarra	a8d0f4374e	Merge pull request 'hotfix ticketSale_discount' (!1416) from hotfix_ticketSale_discount into master ... Reviewed-on: #1416 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:08:56 +00:00
Javier Segarra	ab62cd5627	Merge branch 'master' into hotfix_ticketSale_discount	2025-02-18 08:02:22 +00:00
Alex Moreno	bbaca64cc9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-18 08:57:39 +01:00
Alex Moreno	ec24b928a9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-18 08:55:59 +01:00
Alex Moreno	8a81621076	Merge pull request '8622-testToMaster' (!1411) from 8622-testToMaster into master ... Reviewed-on: #1411 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 07:54:23 +00:00
Alex Moreno	f7f3146e77	chore: refs #8622 changelog	2025-02-18 07:24:54 +01:00
Alex Moreno	29920a2939	Merge pull request 'test: refs #8372 update submit button selector in InvoiceInVat spec' (!1414) from 8372-fixVatTest into dev ... Reviewed-on: #1414 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 06:23:51 +00:00
Javier Segarra	93401dfcdc	fix: use mana in ticketSale.discount	2025-02-18 00:40:39 +01:00
Javier Segarra	6bb758b88c	fix: reload table when apply discount	2025-02-18 00:40:13 +01:00
Javier Segarra	07e6cebf04	Merge pull request 'Warmfix: style card mode' (!1398) from warmfix_style_vnTable_card into test ... Reviewed-on: #1398 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-17 17:42:30 +00:00
Javier Segarra	22bedf2fc4	Merge branch 'test' into warmfix_style_vnTable_card	2025-02-17 17:40:05 +00:00
Javier Segarra	3e2caa18d2	Merge pull request 'warmfix: computed attrs' (!1412) from warmfix_requiredSage into test ... Reviewed-on: #1412 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-17 17:39:53 +00:00
Jorge Penadés	9e6ab80e74	test: refs #8372 update submit button selector in InvoiceInVat spec	2025-02-17 18:25:18 +01:00
PAU ROVIRA ROSALENY	6365fc7477	Merge pull request 'feat: #8497 added availabled on travel module' (!1410) from 8497-travelAvailabled into dev ... Reviewed-on: #1410 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 15:17:16 +00:00
PAU ROVIRA ROSALENY	039f075187	Merge branch 'dev' into 8497-travelAvailabled	2025-02-17 15:12:17 +00:00
Javi Gallego	be76de2fa2	Merge pull request 'fix test: OrderCatalog e2e' (!1413) from fix_orderCatalog_e2e into dev ... Reviewed-on: #1413 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 14:44:58 +00:00
Javier Segarra	43181cb1f7	test: remove unnussed click	2025-02-17 14:42:34 +00:00
Javier Segarra	306658c470	fix: computed attrs	2025-02-17 14:05:56 +00:00
Jon Elias	b7f4e2d1b6	Merge pull request '#8246: Use new addressFk field' (!1362) from 8246-UseAddressFk into test ... Reviewed-on: #1362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-17 13:58:52 +00:00
PAU ROVIRA ROSALENY	88167d8c2d	Merge branch 'dev' into 8497-travelAvailabled	2025-02-17 13:50:43 +00:00
PAU ROVIRA ROSALENY	e2c4954a11	feat: refs #8497 added availabled on travel module	2025-02-17 14:49:46 +01:00
Javier Segarra	50019a298c	Merge pull request 'feat: i18n frenchMothersDay' (!1408) from fix_frenchMothersDay_i18n into dev ... Reviewed-on: #1408 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-17 13:44:00 +00:00
Jon Elias	3e111d144e	refactor: refs #8246 fetch options efficiently and deleted unused data	2025-02-17 14:03:51 +01:00
Jon Elias	f2335d7bda	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-UseAddressFk	2025-02-17 14:00:23 +01:00
Jon Elias	10abc4ddae	Merge branch 'dev' into fix_frenchMothersDay_i18n	2025-02-17 12:41:16 +00:00
Guillermo Bonet	e6f6577fc1	Merge branch 'test' into dev	2025-02-17 13:33:16 +01:00
Javier Segarra	7265ac6fc0	Merge branch 'fix_frenchMothersDay_i18n' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_frenchMothersDay_i18n	2025-02-17 13:32:31 +01:00
Javier Segarra	873e31da43	feat: not update dates when non campaign	2025-02-17 13:32:27 +01:00
Javier Segarra	9227f935b0	Merge branch 'warmfix_style_vnTable_card' of https://gitea.verdnatura.es/verdnatura/salix-front into warmfix_style_vnTable_card	2025-02-17 13:29:40 +01:00
Javier Segarra	c93f0bdf11	style: change colors	2025-02-17 13:29:38 +01:00
Javier Segarra	38df9c27ae	Merge pull request 'Warmfix: #6943 addressPropagate' (!1389) from 6943_re_propagate into test ... Reviewed-on: #1389 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 12:20:34 +00:00
Javier Segarra	2177cd3979	Merge branch 'test' into warmfix_style_vnTable_card	2025-02-17 11:43:56 +00:00
Javier Segarra	1bfbdd2d0d	Merge branch 'dev' into fix_frenchMothersDay_i18n	2025-02-17 11:36:40 +00:00
Javier Segarra	4dd180a983	feat: i18n frenchMothersDay	2025-02-17 12:36:18 +01:00
Javier Segarra	985eac702f	Merge branch 'test' into 6943_re_propagate	2025-02-17 11:20:03 +00:00
Javier Segarra	1d3be4856b	fix: refs #6943 required	2025-02-17 12:18:43 +01:00
Pablo Natek	d99253ab79	Merge pull request 'feat: refs #6897 update table column widths and alignment, enhance input' (!1407) from 6897-e2eFixAndMinorfixes into dev ... Reviewed-on: #1407 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-17 10:29:07 +00:00
Pablo Natek	a5b4341c97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-e2eFixAndMinorfixes	2025-02-17 11:13:22 +01:00
Pablo Natek	533b41ad78	feat: refs #6897 update table column widths and alignment, enhance input	2025-02-17 10:53:45 +01:00
Javier Segarra	8daf425adf	Merge pull request 'Warmfix labels and monitorRisk' (!1406) from warmfix_labels into test ... Reviewed-on: #1406 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-17 08:52:10 +00:00
Jon Elias	05d4b08979	Merge branch 'test' into warmfix_labels	2025-02-17 07:40:48 +00:00
Alex Moreno	accea946d1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-17 07:54:54 +01:00
Alex Moreno	0c79f7f5d2	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-17 07:54:22 +01:00
Jose Antonio Tubau	75f6a31c8c	Merge pull request 'refactor: refs #7524 remove limit and sort parameters from FetchData components' (!1344) from 7524-hotfix-removeFetchData into master ... Reviewed-on: #1344 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-17 06:48:16 +00:00