717 Commits

Author	SHA1	Message	Date
elweyn	145c1ffd9b	Assure to have a resendTime in the config.	2021-12-22 12:28:36 +01:00
Hannes Heine	d1b97c4227	Update backend/src/config/index.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-22 12:12:44 +01:00
Hannes Heine	9c4e876c6b	Merge branch 'master' into 1197-admin-interface-created-transactions-list	2021-12-22 08:29:55 +01:00
elweyn	07d4a8103a	Change the query so we get only creation transactions.	2021-12-22 08:26:30 +01:00
elweyn	13642133c1	Moved the filter on creation to the query.	2021-12-22 08:25:08 +01:00
Hannes Heine	69ffa165d5	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-21 16:38:16 +01:00
Ulf Gebhardt	aad32e16f3	Merge branch 'master' into migration_0006-login_users_collation	2021-12-21 15:54:37 +01:00
elweyn	9138a6e407	Remove console.log	2021-12-21 12:44:39 +01:00
elweyn	51168b9ab0	Merge changes on the UserResolver with the changes in master.	2021-12-21 12:32:46 +01:00
Hannes Heine	7716863f90	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-21 11:51:34 +01:00
Ulf Gebhardt	6ae330da51	update required database version	2021-12-21 07:08:17 +01:00
elweyn	1688ded788	Withdrew password argument of createUser.	2021-12-20 15:26:51 +01:00
elweyn	75cbea2321	Change the transactionList query so we can get only creation and get the list for specific users.	2021-12-20 15:15:51 +01:00
Ulf Gebhardt	ce973d1e78	Merge branch 'master' into fix_optin_code_regeneration	2021-12-20 12:36:48 +01:00
ogerly	8e974bbc22	Check for emailChecked in the user search and giving the value to the UserTable	2021-12-20 10:01:53 +01:00
elweyn	ffe3cdf700	Config of resendTime to resendPassword logic	2021-12-17 11:12:52 +01:00
elweyn	da527dd162	Database logics when resending activation link	2021-12-17 11:04:12 +01:00
elweyn	7f650b9755	Adding a configurable resend_time in minutes.	2021-12-17 11:01:23 +01:00
elweyn	8c5fff73ef	Refactoring of the sendActivationEmail so that we can send another email with a new activation link.	2021-12-17 09:49:45 +01:00
Hannes Heine	fedd1d626d	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-17 08:47:59 +01:00
Ulf Gebhardt	8edd750912	fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired	2021-12-16 12:30:04 +01:00
Hannes Heine	07d4bcf258	Merge branch 'master' into 1145-refactor-admin-resolver-from-master	2021-12-14 08:06:30 +01:00
Hannes Heine	eee0964158	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-14 05:39:24 +01:00
elweyn	67a9f2d0e0	Change the amount argument type to float for updatePendingCreation.	2021-12-13 13:17:04 +01:00
elweyn	4c9ebea6b6	Change the amount argument to float for creation of pending creation	2021-12-13 13:16:27 +01:00
elweyn	f787a7470f	Moved reverse of the getPendingCreations to the AdminResolver instead to do it in the CreationConfirm page.	2021-12-13 12:33:36 +01:00
Hannes Heine	f58225df4f	Merge branch 'master' into fix-coin-creation-balanceDate-entry	2021-12-13 11:27:46 +01:00
elweyn	fb001b8886	Change emplacement of receivedDate after possible errors so we don't create the object when we don't need it.	2021-12-13 11:26:30 +01:00
elweyn	284984c296	When creating coins we store the receivedDate at the start of the call and write this value in each date field.	2021-12-13 11:24:09 +01:00
elweyn	a0f6ec65d8	Merge master resolve merge conflict.	2021-12-13 11:19:06 +01:00
Hannes Heine	610d9cf039	Merge branch 'master' into 1145-refactor-admin-resolver-from-master	2021-12-11 11:11:53 +01:00
Ulf Gebhardt	fba757228c	renamed pendingCreations into loginPendingTasksAdmin as to our naming conventions	2021-12-10 17:03:34 +01:00
elweyn	cb3c600216	Adding decay calculation to the creation.	2021-12-10 12:10:38 +01:00
elweyn	40dff50364	state-balance balanceDate can't get the date of the last transaction cause creation is a new transaction.	2021-12-10 11:54:00 +01:00
elweyn	56dd218ee2	Fix updatePendingCreation amount that is send back.	2021-12-10 09:14:22 +01:00
elweyn	9eb4e8603a	Withdrew * 10000 and / 10000 since we need to store the full value.	2021-12-10 09:08:54 +01:00
elweyn	bb6a260ab2	Clean-up code.	2021-12-08 14:56:01 +01:00
elweyn	b77766b04d	Adding the pending and confirmed creation in a map and return old array.	2021-12-08 14:51:10 +01:00
elweyn	6451d75a6e	Changed queries so that we get groupBy sum and orderBy date.	2021-12-08 14:02:56 +01:00
elweyn	f9c8a6861c	Get's every creation of last 3 month.	2021-12-08 13:40:07 +01:00
elweyn	a6443317a9	Getting sum of last 3 month, not ordered by month.	2021-12-08 13:16:17 +01:00
elweyn	77754760d5	WIP: Adding login_pending_tasks_admin query.	2021-12-08 12:48:02 +01:00
elweyn	4d959470ce	WIP: Change the getUserCreations function.	2021-12-08 12:48:02 +01:00
elweyn	c7fbb9b0bf	Changed the Login error handling so that we get the no-account message in case of a specific error, else we send the user to /reset/login	2021-12-07 10:19:29 +01:00
Hannes Heine	963d7de628	Merge branch 'master' into login_call_resetPassword	2021-12-07 10:15:21 +01:00
Ulf Gebhardt	452beec07c	Merge branch 'master' into login_call_resetPassword	2021-12-07 00:26:23 +01:00
elweyn	e84f30c1fc	Merge changes to deletePendingCreation branch.	2021-12-06 14:11:13 +01:00
elweyn	48b7c9a0af	Delete button sends call to Adminresolver deletePendingCreation.	2021-12-06 13:45:50 +01:00
Ulf Gebhardt	bbd54ef607	Merge branch 'master' into login_call_resetPassword	2021-12-06 13:42:48 +01:00
ogerly	b8854f9365	Change the lastUserTransaction.balance and multiplied it by 10000	2021-12-04 10:38:25 +01:00