228 Commits

Author	SHA1	Message	Date
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +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	2210f8970c	Fixes	2022-11-25 12:26:58 +01:00
Joan Sanchez	6b94922335	Fixes	2022-11-25 12:12:48 +01:00
Joan Sanchez	6af7da4793	Updated regex	2022-11-25 11:13:26 +01:00
Joan Sanchez	7ea4d9c2e1	fix(rocketchat): Regex fix	2022-11-25 09:18:21 +01:00
Joan Sanchez	866ee4d565	fix(rocketchat): Replace invalid link characters	2022-11-25 08:36:29 +01:00
Alex Moreno	7651dcb473	feat: resetPasswordRequest use more params	2022-11-23 14:43:18 +01:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Pau	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Pau	56201f4c1a	Start implementing method refs #3681 @3h	2022-11-10 13:37:16 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Alex Moreno	fcf46ade7d	feat: reset-password section	2022-11-07 15:15:00 +01:00
Alex Moreno	5c9bc47235	user model	2022-11-03 14:59:12 +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
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Alex Moreno	a9a20758bd	remove unnecesary	2022-10-26 13:33:02 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02:00
Vicent Llopis	6f7ec12cb2	feat: response as 'reply' and not as 'internNote'	2022-10-19 10:35:41 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +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
Alex Moreno	e240702884	use user	2022-10-13 14:55:34 +02:00
Alex Moreno	acc88c8239	use ejs template	2022-10-11 14:56:33 +02:00
Alex Moreno	2e36164a98	fix(recover-password): use pint/Email	2022-10-11 10:06:25 +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
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Alex Moreno	00f5689825	feat(account): recover-password	2022-09-21 15:15:19 +02:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Vicent Llopis	6367f1ef05	refator: delete sensitive info	2022-09-16 11:46:55 +02:00
Vicent Llopis	cfe5c66fe4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-09-16 09:23:56 +02:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	538c04e8c5	feat: db connection and query	2022-07-29 11:59:03 +02:00
Vicent Llopis	e5349ec7ed	fix: send messages to channels	2022-07-27 09:16:49 +02:00
Alex Moreno	8048d4ce90	feat(notification): basic functionality and test	2022-07-25 08:25:10 +02:00