3179 Commits

Author	SHA1	Message	Date
Moriz Wahl	2c88bc0383	remove query for checkEmail as it is included in the user model now	2022-02-10 07:32:39 +01:00
Moriz Wahl	32fdd77ac7	fix: Wrong Email Spelling in German	2022-02-09 12:23:07 +01:00
Alexander Friedland	7b2589699c	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-09 11:45:13 +01:00
Ulf Gebhardt	ee94c655ef	fix elopage buys not using repository but entity	2022-02-08 15:59:59 +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
elweyn	d502b3d052	yarn lint --fix.	2022-02-07 13:05:06 +01:00
Alexander Friedland	533de795df	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-07 13:04:50 +01:00
ogerly	21da7f4ffb	Removed the firstTransaction property initialization in TransactionList.	2022-02-07 11:56:50 +01:00
ogerly	111894bc3e	Move case firstTransaction in case their is no previous Transaction.	2022-02-07 11:44:32 +01:00
ogerly	e22c701c88	Add firstTransaction boolean to Transaction.	2022-02-07 11:40:26 +01:00
elweyn	520cb22350	Revert "Add firstTransaction boolean to Transaction." ... This reverts commit 8c6aafcedb80e6212fe80d04c60e9340a0a762f6.	2022-02-07 11:38:46 +01:00
ogerly	d3123e00fc	Fill firstTransaction in case decay can not be created.	2022-02-07 11:32:56 +01:00
ogerly	8c6aafcedb	Add firstTransaction boolean to Transaction.	2022-02-07 11:32:09 +01:00
ogerly	27d4623137	Remove firstTransaction from TransactionList.	2022-02-07 11:31:44 +01:00
ogerly	801033138f	Add firstTransaction boolean to TransactionList.	2022-02-07 11:14:07 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
ogerly	4dc4f30097	Add hasElopage to the UserAdmin model.	2022-02-07 10:39:01 +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
ogerly	9d79e35f36	Refactor hasElopageBuys method to a utility method.	2022-02-07 10:34:54 +01:00
Ulf Gebhardt	c6e2d2cf1c	updated version string	2022-02-07 07:57:14 +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	c101873375	removed unnecessary repositories, we can now use the implicit active record functions	2022-02-04 15:44:28 +01:00
Ulf Gebhardt	b54ae48162	fixed query	2022-02-03 21:45:45 +01:00
Ulf Gebhardt	ff77ffc82c	adjusted db version	2022-02-03 21:41:14 +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	8aa67dab1e	removed unnecessary repositories, we can now use the implicit active record functions	2022-02-02 19:51:14 +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	31c00a28e0	adjust required database version	2022-02-02 17:18:29 +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
Ulf Gebhardt	a1548805ac	adjust required database version	2022-02-02 16:26:20 +01:00
Ulf Gebhardt	71551153c4	backend changes to rename login_pending_tasks_admin table to admin_pending_creations	2022-02-02 16:25:15 +01:00
Moriz Wahl	88a269c6be	Merge branch 'master' into clean_database	2022-02-02 16:21:45 +01:00