1740 Commits

Author	SHA1	Message	Date
Wolfgang Huß	f94dc967c0	Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-04-13 10:26:49 +02:00
Moriz Wahl	a6e7036339	remove unused fields from balance model	2022-04-12 21:34:33 +02:00
Moriz Wahl	de6421201d	use getUser helper to get moderator form context	2022-04-12 19:04:29 +02:00
Wolfgang Huß	563afcbf2a	Add EMAIL_CLIENT_URI in config ... - Increment config version. - Correct usage of EMAIL_CLIENT_URI.	2022-04-12 15:36:05 +02:00
Wolfgang Huß	ea5589a840	Add wallet link to transaction mail, first approach	2022-04-12 12:18:04 +02:00
Moriz Wahl	902dce6390	Context interface in balance resolver	2022-04-11 16:24:38 +02:00
Moriz Wahl	d7bec83d25	use Context interface in Transaction resolver	2022-04-11 16:22:32 +02:00
Moriz Wahl	6cc8410720	helper function to get user from context	2022-04-11 16:15:57 +02:00
Moriz Wahl	b0606424d4	Context interface in transaction link resolver	2022-04-11 16:08:39 +02:00
Moriz Wahl	71cb56db0e	no unused lint instruction	2022-04-11 16:04:04 +02:00
Moriz Wahl	8900592b90	use Context interface in GDT resolver	2022-04-11 16:03:12 +02:00
Moriz Wahl	e430ceefa3	remove unused lint rule	2022-04-11 15:59:23 +02:00
Moriz Wahl	9a390c11db	use Context interface in admin resolver	2022-04-11 15:57:59 +02:00
Moriz Wahl	4d09123b0e	remove global no explicit any lint rule	2022-04-11 15:55:05 +02:00
Moriz Wahl	97ee572c3a	Merge branch 'fix-elopage-status' into define-context-object	2022-04-11 15:50:52 +02:00
Moriz Wahl	57298a4d3a	use Context interface in user resolver	2022-04-11 15:50:46 +02:00
Moriz Wahl	f57f67846e	reconstruct context object	2022-04-11 14:58:00 +02:00
Moriz Wahl	37122ee604	Merge branch 'master' into fix-elopage-status	2022-04-06 14:08:51 +02:00
Moriz Wahl	69dae586d8	check that recipient user has activated account in send coins	2022-04-05 15:12:36 +02:00
Moriz Wahl	f3948b39be	pass context object to hasElopage query	2022-04-05 14:50:45 +02:00
Moriz Wahl	447fdb6057	Merge branch 'master' into fix_decay	2022-03-31 22:30:52 +02:00
Moriz Wahl	681d34b1dc	rounding in virtual decay transaction, pass hold available amount to virtual decay creation	2022-03-31 22:17:36 +02:00
Ulf Gebhardt	a9ba92f67b	Transaction Resolver: transmit Redeem Link to calculateBalance	2022-03-31 12:32:35 +02:00
Ulf Gebhardt	9ed00edc52	code order & comment	2022-03-31 12:14:38 +02:00
Ulf Gebhardt	592e16e260	virtual decay transaction is based on full sum not including the link values	2022-03-31 12:09:00 +02:00
Ulf Gebhardt	d349a46f5d	Balance Resolver: calculate Decay on full sum, not including the links	2022-03-31 12:08:09 +02:00
Moriz Wahl	3ad9685a82	Merge branch 'master' into fix-no-email-exposed-on-forgot-password	2022-03-30 20:22:44 +02:00
Moriz Wahl	3078315286	change name and tpye of query sendResetPasswordEmail to mutation forgotPassword. Do not throw when email is not found	2022-03-30 18:24:44 +02:00
Moriz Wahl	0ab4f73f3b	subtract the hold available amount from last transaction balance for virtual decay transaction	2022-03-30 15:10:36 +02:00
Ulf Gebhardt	10ae00dba8	Merge branch 'master' into mass_creation_do_not_show_unactivated	2022-03-29 20:31:05 +02:00
Moriz Wahl	1db61b3efd	Merge branch 'master' into show-valid-time-of-link-in-email	2022-03-29 20:22:20 +02:00
Moriz Wahl	07ad22b71d	change function name to print time duration	2022-03-29 20:10:00 +02:00
Moriz Wahl	a38a7889a3	Merge branch 'master' into refactor-balance-resolver	2022-03-29 19:59:12 +02:00
Moriz Wahl	a4b30b385f	Merge branch 'master' into show-valid-time-of-link-in-email	2022-03-29 19:49:24 +02:00
Moriz Wahl	43242c98b4	Merge branch 'master' into refactor-balance-resolver	2022-03-29 16:15:33 +02:00
Moriz Wahl	90e6798a7d	rename context.count to context.transactionCount	2022-03-29 16:10:06 +02:00
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	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	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