1775 Commits

Author	SHA1	Message	Date
Moriz Wahl	0c5719140d	Merge branch 'master' into optin-valid-time	2022-03-29 16:05:56 +02:00
Ulf Gebhardt	d95e4d864a	Merge branch 'master' into mass_creation_do_not_show_unactivated	2022-03-29 12:43:13 +02:00
Moriz Wahl	8fd93ff853	remove test for remove optin from DB after email verification	2022-03-29 02:58:36 +02:00
Moriz Wahl	633eef7c16	round GDD values in balance object	2022-03-29 02:34:13 +02:00
Moriz Wahl	feb89cf4e0	import transaction as db transaction	2022-03-29 01:58:20 +02:00
Moriz Wahl	51258b838e	set rights correctly	2022-03-29 01:55:59 +02:00
Moriz Wahl	27ad1d2e22	transaction list model contains balance, user balance resolver to create transacton list result	2022-03-29 01:54:13 +02:00
Moriz Wahl	e9e97549a7	rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails	2022-03-29 01:12:07 +02:00
Moriz Wahl	d584651fc1	rename right to GDT_BALANCE	2022-03-29 01:11:25 +02:00
Moriz Wahl	a26aaae71a	Merge branch 'master' into refactor-balance-resolver	2022-03-29 01:03:52 +02:00
Moriz Wahl	9eda41b24a	Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email	2022-03-29 00:59:47 +02:00
Moriz Wahl	37e36e01af	do not remove optin code in DB after email verification	2022-03-29 00:51:44 +02:00
Moriz Wahl	cb90249301	rename function, add parameter for optinType, sort by updatedAt DESC	2022-03-29 00:50:50 +02:00
Moriz Wahl	3128ede829	Merge branch 'master' into optin-valid-time	2022-03-29 00:34:04 +02:00
Alexander Friedland	d5b57dcf1c	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-28 18:00:25 +02:00
ogerly	549a36cb56	add linkCount and linkList in query	2022-03-25 20:17:33 +01:00
Ulf Gebhardt	33638598a0	notActivated & isDeleted are both nullable ... Admin User Search is a nightmare codewise	2022-03-25 13:43:53 +01:00
Ulf Gebhardt	58eacb85ce	do not show unactivated emails in masscreation list	2022-03-25 13:35:33 +01:00
Moriz Wahl	5456affb9c	fix logic (not canResendOptIn), fix error strings	2022-03-24 19:27:32 +01:00
Moriz Wahl	9da2047e8c	move sendActivationEmail mutation from user to admin resolver	2022-03-24 19:14:59 +01:00
Moriz Wahl	1e3300ad5a	use optIn as naming convention	2022-03-24 18:38:24 +01:00
Moriz Wahl	607805075c	refactor sendActivationEmail, get rid of getOptInCode function	2022-03-24 18:33:07 +01:00
Moriz Wahl	965ab22bab	create helper functions for time management, rename some functions	2022-03-24 18:17:46 +01:00
Moriz Wahl	7cd920686d	helper function to create a new email optin object. Use this in create user	2022-03-24 17:50:34 +01:00
Moriz Wahl	8718fdee7b	add comentary to explain the meaning of the constants	2022-03-24 17:38:03 +01:00
Moriz Wahl	ac000296da	enums for optin types	2022-03-24 17:37:07 +01:00
Moriz Wahl	30543942d8	check for valid min/max length of memeo before executing transaction	2022-03-24 14:36:16 +01:00
Moriz Wahl	0c0ce1b579	add new env variable to define email optin request time delay	2022-03-24 14:05:23 +01:00
Moriz Wahl	34d3893f1c	Merge branch 'master' into optin-valid-time	2022-03-24 14:00:41 +01:00
Ulf Gebhardt	09360f70ee	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-24 11:28:58 +01:00
Moriz Wahl	bd79d63783	Merge branch 'master' into add-sender-email-to-transaction-mail	2022-03-23 20:59:31 +01:00
Moriz Wahl	3509087166	Update backend/src/mailer/text/transactionReceived.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 20:59:13 +01:00
Moriz Wahl	80a8217217	Update backend/src/mailer/sendTransactionReceivedEmail.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 20:58:57 +01:00
Ulf Gebhardt	20318546a8	Merge branch 'master' into enforce_config_version	2022-03-23 20:33:23 +01:00
Alexander Friedland	1680a15b8a	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-23 20:16:25 +01:00
Ulf Gebhardt	c0c6630873	make redeemCode nullable	2022-03-23 19:59:29 +01:00
Ulf Gebhardt	eaed95cdf8	Merge branch 'master' into enforce_config_version	2022-03-23 19:56:36 +01:00
Moriz Wahl	65fb882f63	Update backend/src/webhook/elopage.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 19:40:36 +01:00
Moriz Wahl	3a8229f60f	include hold available amount in balance calculation	2022-03-23 19:18:18 +01:00
Moriz Wahl	a1ac6600b7	refactor resolvers to use balance resolver and model	2022-03-23 19:06:12 +01:00
Moriz Wahl	f46bd23c11	refactor balance model	2022-03-23 19:05:19 +01:00
Moriz Wahl	243058ee5a	get GDT sum via GDT resolver	2022-03-23 18:18:07 +01:00
Moriz Wahl	8277773006	add gdtSum query	2022-03-23 18:13:54 +01:00
Moriz Wahl	17256c27ba	test presence of sender email in transaction received email	2022-03-23 17:30:52 +01:00
Moriz Wahl	9ed400f511	add sender email to transaction received email	2022-03-23 17:27:47 +01:00
Moriz Wahl	174e1ab597	fix test	2022-03-23 17:12:09 +01:00
Moriz Wahl	cc0efb2204	test link duration in mails	2022-03-23 17:02:53 +01:00
Moriz Wahl	f1686523df	add link information to reset password email	2022-03-23 16:57:04 +01:00
Moriz Wahl	d1644ad2ae	add information about link duration and how to get a new link in email	2022-03-23 16:49:30 +01:00
Moriz Wahl	3d613e72f5	add link to forgot-password	2022-03-23 16:48:35 +01:00