564 Commits

Author	SHA1	Message	Date
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
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	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	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
Pau	c1c06f27d3	create save.js	2022-10-27 08:21:21 +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	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	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02: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
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
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	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +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
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
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	22187c1450	Enforce npm node version	2022-10-06 11:32:13 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Joan Sanchez	68d7bc8e20	Test	2022-10-05 14:14:05 +02:00
Joan Sanchez	3d36c0339a	Merge branch 'dev' into 4592-jenkins_tests	2022-10-05 12:05:10 +00:00
Joan Sanchez	076fce058c	Exit on completion	2022-10-05 13:38:17 +02:00
Joan Sanchez	df929c77ce	Test	2022-10-05 13:32:43 +02:00
Joan Sanchez	726b2d5eb2	Exit on completion	2022-10-05 13:26:18 +02:00
Joan Sanchez	6f8e2c8e79	Disabled junit	2022-10-05 13:01:28 +02:00
Joan Sanchez	9644e1e5ec	Removed console.log	2022-10-05 12:37:16 +02:00
Joan Sanchez	f256af3d02	Log host ip	2022-10-04 14:48:28 +02: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	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Alex Moreno	00f5689825	feat(account): recover-password	2022-09-21 15:15:19 +02:00
Vicent Llopis	04676d5d98	fix: jump to next iteration if file not found	2022-09-21 08:56:13 +02:00
Joan Sanchez	71f8e73e55	Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev ... Reviewed-on: #1056 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:46:24 +00:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Vicent Llopis	6367f1ef05	refator: delete sensitive info	2022-09-16 11:46:55 +02:00
Vicent Llopis	7480bf8a69	feat: do nothing if user and password are empty in osTicketConfig	2022-09-16 10:31:02 +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	5fce5b3e4f	refator: delete console.log	2022-09-15 08:38:00 +02:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Joan Sanchez	fce26342a9	Return inside try-catch	2022-09-08 11:42:16 +02:00
Joan Sanchez	4251b0baeb	Removed debug logs	2022-09-08 11:19:04 +02:00
Joan Sanchez	b499de7c08	tx commit	2022-09-08 10:33:51 +02:00
Joan Sanchez	151e1b52ed	Updated transaction	2022-09-08 09:21:05 +02:00
Joan Sanchez	ab86ba0652	Disabled transaction	2022-09-07 12:28:53 +02:00
Joan Sanchez	aec053868d	Debug logs	2022-09-07 11:50:02 +02:00
Joan Sanchez	48916e2b07	Debug logs	2022-09-07 11:26:58 +02:00
Joan Sanchez	8f86cacc96	Missing await	2022-09-07 10:48:24 +02:00
Joan Sanchez	aba1696ad7	Changes	2022-09-07 10:26:32 +02:00
Joan Sanchez	7264595646	Throw error for max-retries	2022-09-06 14:23:25 +02:00
Joan Sanchez	5c5440cdfc	Removed callback	2022-09-06 13:13:49 +02:00
Joan Sanchez	37f0b557f4	Removed callback	2022-09-06 13:13:29 +02:00
Joan Sanchez	6410a4db42	Send response before ending task execution	2022-09-06 12:54:33 +02:00
Joan Sanchez	011e372558	Removed wrong commit code pick	2022-09-06 12:21:38 +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
Joan Sanchez	e916915435	Updated to POST	2022-07-26 12:08:38 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	2b19688ca4	quit focus	2022-07-25 08:25:46 +02:00
Alex Moreno	8048d4ce90	feat(notification): basic functionality and test	2022-07-25 08:25:10 +02:00
Alex Moreno	f432d64f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-07-25 07:45:26 +02:00
Vicent Llopis	5491fce0c6	fix: musn't delete files on test enviroment	2022-07-21 13:16:30 +02:00
Vicent Llopis	eccbd942f7	feat: can close a ticket	2022-07-21 13:11:24 +02:00
Vicent Llopis	0ff3a9d45a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-07-21 12:23:44 +02:00
Alex Moreno	9b48cbb078	feat(notification): send	2022-07-20 14:54:50 +02:00
Alex Moreno	7895decf4e	feat(notification): create models	2022-07-19 15:17:22 +02:00
Vicent Llopis	1be0e9b7a9	feat: delete dms trash file	2022-07-19 12:40:52 +02:00
Vicent Llopis	5eec01bdc3	feat: close tickets	2022-07-19 11:20:08 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00