9547 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	d56e20d057	Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test ... Reviewed-on: #1425 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-18 10:40:57 +00:00
Javier Segarra	b3e724c684	fix: style	2025-02-18 11:34:03 +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	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
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
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
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
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	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
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	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
Jose Antonio Tubau	8cd8d90925	Merge branch 'master' into 7524-hotfix-removeFetchData	2025-02-17 06:08:52 +00:00
Javier Segarra	a3804d5e10	Merge branch 'test' into 6943_re_propagate	2025-02-17 00:40:08 +01:00
Javier Segarra	54b4791849	test: refs #6943 fix tests	2025-02-17 00:38:28 +01:00
Javier Segarra	a8dbcfbd74	feat: toCurrency in risk icon	2025-02-16 03:35:23 +01:00
Javier Segarra	3d7cb05661	fix: replace labels	2025-02-16 03:34:00 +01:00
Javier Segarra	fc80946817	fix: refs #6943 minor changes	2025-02-14 17:18:36 +01:00
Jorge Penadés	63659a1a77	Merge pull request 'fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu' (!1401) from 8247-hotfix-showOpt into master ... Reviewed-on: #1401 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-14 13:37:19 +00:00
Alex Moreno	fb0cc0272f	build: empty commit	2025-02-14 14:32:55 +01:00
Jorge Penadés	fff129e913	fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu	2025-02-14 13:48:04 +01:00
Guillermo Bonet	bf6bb954bb	Merge branch 'master' into test	2025-02-14 12:42:04 +01:00
Javier Segarra	bc42d892ed	Merge pull request 'Warmfix: show descriptors when click on it' (!1394) from warmfix_vnTable_card_descriptor into test ... Reviewed-on: #1394 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-14 11:39:58 +00:00
Javier Segarra	60bbf4f8ad	Merge branch 'test' into warmfix_vnTable_card_descriptor	2025-02-14 11:38:59 +00:00
Guillermo Bonet	d3e4b32bee	fix: refs #8172 Remove unused row and column fields from ParkingBasicData	2025-02-14 12:32:32 +01:00
Javier Segarra	caa8682180	style: fix card mode	2025-02-14 11:44:19 +01:00
Jorge Penadés	503e3e084c	Merge pull request 'fix: refs #7353 add zone filter to exprBuilder' (!1397) from 7353-hotfix-filter into master ... Reviewed-on: #1397 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-14 10:41:55 +00:00
Jorge Penadés	67e318f979	fix: refs #7353 add zone filter to exprBuilder	2025-02-14 11:40:24 +01:00
Alex Moreno	bf08509b52	Merge pull request 'fix: refs #8227 warnfix' (!1385) from 8227-warmfixRoute into test ... Reviewed-on: #1385 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-14 09:45:37 +00:00
Carlos Satorres	984717a948	Merge branch 'test' into 8227-warmfixRoute	2025-02-14 09:43:32 +00:00
Javier Segarra	1059bf75a7	fix: show descriptors when click on it	2025-02-14 10:27:19 +01:00
Alex Moreno	40c40bcea6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-14 07:04:20 +01:00
Alex Moreno	95f6931ed4	Merge pull request 'Warmifx[ClaimList/filter]: Fixed states column' (!1386) from Warmfix-ClaimSectionErrors into test ... Reviewed-on: #1386 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-14 06:02:01 +00:00