2101 Commits

Author	SHA1	Message	Date
Jorge Penadés	6d674f2a2b	Merge branch 'dev' into 7874-addObservationType	2024-10-10 13:41:01 +00:00
Javier Segarra	3dfb836f8e	revert: rollback compress spacestyle	2024-10-10 13:56:11 +02:00
Jorge Penadés	830decb6db	Merge branch 'dev' into 7874-addObservationType	2024-10-10 08:16:36 +00:00
Alex Moreno	b6778aaf17	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-08 12:24:39 +02:00
Alex Moreno	bde739e7ef	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 06:50:16 +00:00
Javier Segarra	43da6ea1b8	Merge branch 'master' into hotfix_vnImg_zoom_resolution	2024-10-07 12:00:12 +00:00
Javier Segarra	0ed9fdd55d	fix: refs VnImg zoom resolution missing property	2024-10-07 13:02:40 +02:00
Alex Moreno	b8407140f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:02:01 +02:00
Alex Moreno	426b7254d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:01:57 +02:00
Alex Moreno	34a40dd87c	fix(VnPaginate): use default value	2024-10-07 08:24:53 +02:00
Javier Segarra	04b2a4d9ce	perf: clean warnings	2024-10-05 00:31:41 +02:00
Jorge Penadés	9c5ce6dbfd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 13:50:31 +02:00
Jorge Penadés	b735ccb3a0	Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:55 +02:00
Jorge Penadés	67c2e284ba	feat: refs #7702 ask old pass	2024-10-04 11:45:10 +02:00
Jorge Penadés	cd20db637c	fix: refs #7874 btn ui	2024-10-03 15:30:26 +02:00
Jorge Penadés	e10088ed06	Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-03 13:49:33 +02:00
Jorge Penadés	01dc25da8c	refactor: refs #7874 create element if condition	2024-10-03 10:23:27 +02:00
Jorge Penadés	a8c48789ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 10:03:49 +02:00
Jorge Penadés	9b8e388525	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 09:49:04 +02:00
Pablo Natek	06fa5b13a4	Merge branch 'dev' into 7404-fixStyle	2024-10-03 07:47:52 +00:00
Javi Gallego	df64814c57	fix: hotfix refund invoice	2024-10-03 08:31:13 +02:00
Javi Gallego	ed5cf137b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-03 08:29:29 +02:00
Javi Gallego	b08a5e63e9	fix: inheritWarehouse	2024-10-03 08:29:26 +02:00
Carlos Satorres	ba3b2198b8	Merge branch 'dev' into warmFix-userListFixRole	2024-10-02 09:31:54 +00:00
Pablo Natek	c0fd5a1c21	fix: refs #7404 fix style	2024-10-01 16:12:18 +02:00
Javier Segarra	6e4677848f	Merge branch 'dev' into Fix-TicketSale	2024-10-01 09:53:34 +00:00
Javier Segarra	27b2d0232c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev	2024-10-01 11:35:14 +02:00
Carlos Satorres	e64e6eefe3	refs #7355 add role	2024-10-01 10:35:31 +02:00
Javier Segarra	8fa82c818d	fix: remove limit	2024-10-01 10:04:56 +02:00
Javier Segarra	d6efd21db6	style: remove space between value and label	2024-10-01 10:03:39 +02:00
Javier Segarra	e9364f69d4	feat: #7679 show tooltips	2024-10-01 10:03:14 +02:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Javier Segarra	41acf0e1e2	feat: #7679 show country provinces	2024-10-01 00:24:34 +02:00
Javier Segarra	2302e22f11	fix: solve conflicts from master to test	2024-09-30 15:00:05 +02:00
Pablo Natek	deb608cc96	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 12:26:37 +00:00
Javier Segarra	7001a707b9	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 11:34:38 +00:00
Javier Segarra	da78edb6d2	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 13:34:21 +02:00
Javier Segarra	cf509d608a	Merge branch 'dev' into 8018_location_label	2024-09-30 10:53:33 +00:00
Javier Segarra	b3c36e555f	style: refs #7404 compress spaces	2024-09-30 12:50:23 +02:00
Javier Segarra	b41026806f	style: refs #7404 compress spaces	2024-09-30 12:48:05 +02:00
Javier Segarra	cf67865b0b	feat: refs #7404 updates	2024-09-30 11:53:54 +02:00
Javier Segarra	63d2b06b70	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 08:23:12 +00:00
Pablo Natek	37d32a7934	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 08:14:44 +00:00
Pablo Natek	868e6a312f	fix: refs #7404 class name	2024-09-30 10:04:00 +02:00
Pablo Natek	cb0d3c5bca	fix: refs #7404 sticky footer and transparent header for vnTable	2024-09-30 09:46:00 +02:00
Javier Segarra	12a452d774	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-27 18:02:24 +00:00
Javier Segarra	bec50d6eed	perf: refs #7679 #7679 comments	2024-09-27 19:54:01 +02:00
Javier Segarra	157370ec26	Merge branch 'dev' into 8018_location_label	2024-09-27 13:18:06 +02:00
Javier Segarra	e06d567e3c	test: refs #7679 #7679 remove comment	2024-09-27 10:35:39 +02:00
Javier Segarra	d2067c633d	feat: refs #7679 #7679 use country or province to retrieve cities	2024-09-26 23:38:22 +02:00