356 Commits

Author	SHA1	Message	Date
Alexandre Riera	6130547420	Merge branch 'dev' into 4503-opcion-rocket	2022-12-16 12:42:42 +00:00
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Vicent Llopis	2801e11965	Merge branch 'dev' into DEV_fix_deleteTrashFiles	2022-11-29 07:43:50 +00:00
Vicent Llopis	d58e567295	fix: maneja si el dms no tiene file. Simplemente borra el registro	2022-11-28 08:51:04 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Joan Sanchez	ca0164ff18	unit test updated	2022-11-25 12:56:25 +01:00
Joan Sanchez	2210f8970c	Fixes	2022-11-25 12:26:58 +01:00
Joan Sanchez	db64ba48fc	fix(rocketchat): Removed parenthesis	2022-11-25 08:45:26 +01:00
Alex Moreno	7651dcb473	feat: resetPasswordRequest use more params	2022-11-23 14:43:18 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Alex Moreno	f8e6b71bc6	typo	2022-11-18 10:27:05 +01:00
Alex Moreno	77b2f9cbd9	user emailUser	2022-11-18 10:25:25 +01:00
Alex Moreno	d70d848717	fix: use vn email	2022-11-18 09:57:07 +01:00
Alexandre Riera	c5fb565484	refs #4503 message added	2022-11-15 10:25:33 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +01:00
Joan Sanchez	83590b3adf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-10 11:54:05 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Vicent Llopis	9890db820b	feat: borra los dms sin file y elimina registros aunq no se pueda eliminar la carpeta	2022-11-08 12:48:09 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Joan Sanchez	e2101db706	Merge branch 'dev' into 4155-close_tickets_fix2	2022-11-02 11:53:47 +00:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	ad1b429d10	check if user has role from userToUpdate	2022-10-28 08:09:47 +02:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	5c65314162	use findById	2022-10-27 09:27:50 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Vicent Llopis	6f7ec12cb2	feat: response as 'reply' and not as 'internNote'	2022-10-19 10:35:41 +02:00
Vicent Llopis	e6481af3a9	delete: transaction	2022-10-17 13:13:14 +02:00
Alex Moreno	c24b975f26	remove node_env	2022-10-17 12:14:11 +02:00
Alex Moreno	aef47d46b1	env test	2022-10-17 12:12:10 +02:00
Alex Moreno	3e746ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-14 14:47:42 +02:00
Alex Moreno	c637f2c879	feat(send): use vn-print libary and adapt test	2022-10-14 13:22:53 +02:00
Alex Moreno	de44ce6bd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-10-14 12:44:42 +02:00
Alex Moreno	c2d37dadf7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-10-14 08:01:06 +02:00
Joan Sanchez	b2e98c9d73	Transaction	2022-10-11 14:39:57 +02:00
Joan Sanchez	d06492d367	Transaction error	2022-10-11 14:28:14 +02:00
Alex Moreno	2e36164a98	fix(recover-password): use pint/Email	2022-10-11 10:06:25 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Alex Moreno	7a690dd880	feat(user): add section privileges and remove changeRole in descriptor ... test(user):back and e2e	2022-10-03 15:11:29 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00