588 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	2ead25c69b	Merge branch 'dev' into 6076-2FA	2023-08-10 06:58:52 +00:00
Guillermo Bonet	a9851e3781	Merge pull request 'refs #6080 New left menu Salix' (!77) from 6080-leftMenuSalix into dev ... Reviewed-on: #77 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-10 05:52:07 +00:00
Alex Moreno	cab607f600	refs #6080 test(LeftMenu): undo skip	2023-08-10 07:26:50 +02:00
Guillermo Bonet	1bd6f4a7c7	Merge branch 'dev' into 6080-leftMenuSalix	2023-08-10 07:10:41 +02:00
Guillermo Bonet	45cfdc5edb	refs #6080 Fixed tests	2023-08-10 07:06:35 +02:00
Alex Moreno	87d6304218	Merge branch 'dev' into 6076-2FA	2023-08-09 13:01:11 +00:00
Jorge Penadés	2816413eb6	Merge pull request '5986-redisgnDescriptors' (!73) from 5986-redisgnDescriptors into dev ... Reviewed-on: #73 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-09 12:59:35 +00:00
Jorge Penadés	dd9b58a0ab	Merge branch 'dev' into 5986-redisgnDescriptors	2023-08-09 12:57:26 +00:00
Alex Moreno	220847ef3a	Merge branch 'dev' into 6076-2FA	2023-08-09 12:57:00 +00:00
Alex Moreno	fbb347f719	refs #6080 test: skip Leftmenu	2023-08-09 14:54:32 +02:00
Alex Moreno	df7366195a	refs #5989 fix: revert appName	2023-08-09 14:42:37 +02:00
Guillermo Bonet	df66903e49	refs #6080 Deleted unused function	2023-08-09 14:34:43 +02:00
Jorge Penadés	ad17737947	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors	2023-08-09 14:31:09 +02:00
Guillermo Bonet	980b221bd4	Merge branch '6080-leftMenuSalix' of https://gitea.verdnatura.es/verdnatura/salix-front into 6080-leftMenuSalix	2023-08-09 14:29:29 +02:00
Alex Moreno	458de4e849	Merge branch 'dev' into 6076-2FA	2023-08-09 11:41:05 +00:00
Guillermo Bonet	7d432b60a1	Merge branch '6080-leftMenuSalix' into dev	2023-08-09 13:36:08 +02:00
Guillermo Bonet	0b066062ea	refs #6080 Changes in components	2023-08-09 13:29:00 +02:00
Alex Moreno	20c15020a0	refs #5989 fix: correct redirect	2023-08-09 12:57:35 +02:00
Alex Moreno	e326e4e4d7	Merge pull request 'refs #5989 btn redirection' (!69) from 5989-redirectSalix into dev ... Reviewed-on: #69 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-09 10:39:53 +00:00
Alex Moreno	0cb283a535	Merge branch 'dev' into 5989-redirectSalix	2023-08-09 10:34:58 +00:00
Alex Moreno	911327a59b	Merge branch 'dev' into 6076-2FA	2023-08-09 10:24:55 +00:00
Jorge Penadés	9536ce77ac	Merge branch '5986-redisgnDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors	2023-08-09 12:20:06 +02:00
Jorge Penadés	3817328661	refs #5986 console log removed	2023-08-09 12:20:04 +02:00
Alex Moreno	be9790fb89	Merge branch 'dev' into 5986-redisgnDescriptors	2023-08-09 10:17:20 +00:00
Jorge Penadés	32ca81ebad	refs #5986 WorkerDescriptorProxy added	2023-08-09 12:16:08 +02:00
Alex Moreno	d4c82073f8	Merge pull request 'refs #5988 Added left space to subsection' (!76) from 6080-leftSpaceSubsection into dev ... Reviewed-on: #76 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-09 10:11:35 +00:00
Carlos Satorres	f6d35b80ad	Merge branch '5989-redirectSalix' of https://gitea.verdnatura.es/verdnatura/salix-front into 5989-redirectSalix	2023-08-09 12:06:37 +02:00
Carlos Satorres	a034d135c2	refs #5989 remove console logs	2023-08-09 12:06:24 +02:00
Jorge Penadés	7940d1702b	refs #5987 refactor descriptors and VnLv	2023-08-09 10:39:37 +02:00
Guillermo Bonet	6d2436c9f7	refs #5988 Improved identation	2023-08-09 10:09:37 +02:00
Carlos Satorres	890a9fb9ee	Merge branch 'dev' into 5989-redirectSalix	2023-08-09 08:04:26 +00:00
Carlos Satorres	566f7df2d0	refs #5989 tooltip, refact function,	2023-08-09 10:02:48 +02:00
Guillermo Bonet	d16c215936	refs #5995 Added left space to subsection	2023-08-09 09:43:24 +02:00
Guillermo Bonet	8d4faa270b	refs #5995 Added left space to subsection	2023-08-09 07:23:28 +02:00
Jorge Penadés	b98179563e	refs #5987 stateColor replaced	2023-08-08 15:15:41 +02:00
Alex Moreno	68935f2a4d	refs #6075 fix: add $props.value	2023-08-08 14:47:39 +02:00
Jorge Penadés	eb95ff18ec	refs #5986 refactored ticket stateColor	2023-08-08 13:48:36 +02:00
Carlos Satorres	c1a410384f	Merge branch '5989-redirectSalix' of https://gitea.verdnatura.es/verdnatura/salix-front into 5989-redirectSalix	2023-08-08 12:54:20 +02:00
Carlos Satorres	05b9f7c84e	refs #5989 change icon	2023-08-08 12:54:18 +02:00
Carlos Satorres	ab71e36053	Merge branch 'dev' into 5989-redirectSalix	2023-08-08 10:12:02 +00:00
Carlos Satorres	d7bc166df7	refs #5989 redirect and home	2023-08-08 12:11:27 +02:00
Jorge Penadés	8ba7615aee	refs #5986 fix state color	2023-08-08 11:35:35 +02:00
Jorge Penadés	f94f87590a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors	2023-08-08 10:26:56 +02:00
Jorge Penadés	b12ab288da	refs #5986 WIP descriptors replaced	2023-08-08 10:24:01 +02:00
Carlos Satorres	dbd5715c13	Merge branch '5989-redirectSalix' of https://gitea.verdnatura.es/verdnatura/salix-front into 5989-redirectSalix	2023-08-08 09:37:48 +02:00
Carlos Satorres	9a634f08a5	refs #5989 bton redirect	2023-08-08 09:31:09 +02:00
Alex Moreno	c75c404c29	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2023-08-08 08:47:40 +02:00
Alex Moreno	c077b7cbcf	Merge pull request 'TEST refs #6083 feat: ticketSms section' (!72) from 6083-ticketSms into test ... Reviewed-on: #72 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-08-08 06:47:12 +00:00
Alex Moreno	1f573b9922	refs #6083 feat: ticketSms section	2023-08-07 14:02:22 +02:00
Alex Moreno	1b79fd633a	refs #6076 unnecesary use props	2023-08-04 13:37:12 +02:00