699 Commits

Author	SHA1	Message	Date
Moriz Wahl	1335bb8e26	activate UserResolver test again	2022-02-16 13:18:59 +01:00
Ulf Gebhardt	a37b479158	fixed sendCoins	2022-02-16 12:29:16 +01:00
Alexander Friedland	912e35090a	Merge branch 'master' into static_decay_block	2022-02-16 11:51:01 +01:00
Moriz Wahl	2294997734	throw again when GDT server is not reachable	2022-02-16 09:39:42 +01:00
Moriz Wahl	efaef025ee	do not throw error when GDT server is not reachable	2022-02-16 09:32:24 +01:00
Moriz Wahl	283cfcc84a	GDT server not reachable error thrown	2022-02-16 09:23:58 +01:00
Moriz Wahl	58ee714e17	allow gdtSum to be null	2022-02-16 09:05:42 +01:00
Moriz Wahl	488a113ae7	Merge branch 'master' into admin_user_search_optimization	2022-02-15 14:13:33 +01:00
Alexander Friedland	5b892d761e	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-15 09:22:24 +01:00
Moriz Wahl	8fddffd466	Merge branch 'master' into do-not-throw-gdt-errors	2022-02-15 07:51:50 +01:00
Moriz Wahl	22c408f633	fix: Catch GDT Server Errors	2022-02-14 14:34:43 +01:00
Ulf Gebhardt	f3b3fa2eba	do not query on email opt in type, since we have different ones and legacy types. Furthermore order the result of the query.	2022-02-14 13:45:48 +01:00
Moriz Wahl	a79f1067ef	Merge branch 'master' into admin_user_search_optimization	2022-02-13 15:08:14 +01:00
Einhornimmond	692433ce51	try fix linting	2022-02-13 09:22:05 +01:00
Moriz Wahl	15a9af4552	Merge branch 'master' into admin-email-confirmation	2022-02-11 16:29:05 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00
ogerly	5319f6de1e	remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 12:10:00 +01:00
Einhornimmond	6e63bacba7	let handle mysql the paging	2022-02-11 10:15:09 +01:00
Moriz Wahl	0a545c5fbe	fix missing negator	2022-02-10 08:14:58 +01:00
Moriz Wahl	b3be4f664a	add date of last email confirmation send to admin user	2022-02-10 08:05:25 +01:00
Moriz Wahl	2c88bc0383	remove query for checkEmail as it is included in the user model now	2022-02-10 07:32:39 +01:00
Alexander Friedland	7b2589699c	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-09 11:45:13 +01:00
Alexander Friedland	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +01:00
Alexander Friedland	55573ea2ce	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-08 08:31:13 +01:00
Ulf Gebhardt	8e769e7b0e	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 13:07:55 +01:00
Alexander Friedland	533de795df	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-07 13:04:50 +01:00
ogerly	111894bc3e	Move case firstTransaction in case their is no previous Transaction.	2022-02-07 11:44:32 +01:00
ogerly	d3123e00fc	Fill firstTransaction in case decay can not be created.	2022-02-07 11:32:56 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
ogerly	3806beb01e	Add hasElopage flag to user entity for the admin user search.	2022-02-07 10:38:35 +01:00
ogerly	555420a568	Remove unused imports, extract hasElopageBuys to utility.	2022-02-07 10:36:43 +01:00
Ulf Gebhardt	817e462698	fixed backend according to migration	2022-02-07 05:01:49 +01:00
Hannes Heine	80956bcee9	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-05 17:23:02 +01:00
Ulf Gebhardt	c21f7da5ce	lint fixes	2022-02-04 15:50:24 +01:00
elweyn	14d9366ad6	Merge branch 'remove_unnecessary_repositories' of https://github.com/gradido/gradido into remove_unnecessary_repositories	2022-02-04 15:49:21 +01:00
Ulf Gebhardt	545aca8ffb	lint fix	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	c63a42009e	removed references and implemented implicit active record queries	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	17e2e28aec	fixed backend implementation	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	6500901e2f	lint fix	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	da349230c8	removed LoginBackupUsers entity & references from backend resolvers	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	a334c916fd	fixed business logic with only one user	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	7baf05cf14	corrected field pubKey rename	2022-02-03 21:35:15 +01:00
ogerly	4c3c49c9aa	add hasElopage status in AdminResolver.ts	2022-02-03 11:43:07 +01:00
Ulf Gebhardt	ab38a66c84	Update backend/src/graphql/resolver/TransactionResolver.ts	2022-02-03 00:48:15 +01:00
Ulf Gebhardt	8005b700c3	removed references and implemented implicit active record queries	2022-02-02 19:54:47 +01:00
Ulf Gebhardt	bec09fc7f4	Update backend/src/graphql/resolver/TransactionResolver.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-02 19:48:20 +01:00
Ulf Gebhardt	736310f5d5	fix build error - type errors	2022-02-02 19:48:20 +01:00
Ulf Gebhardt	378bae4323	made decay block static ... removed duplicate implementation of decay calculation	2022-02-02 19:48:20 +01:00
Ulf Gebhardt	07299299a7	remove explicit write on removed column blockchainTypeId ... removed test result comment from code	2022-02-02 17:18:28 +01:00
Ulf Gebhardt	28e6522052	redo the remove repository change for AdminResolver and AdminPendingCreations since the Filename changed and git could not resolve this	2022-02-02 16:40:08 +01:00