1720 Commits

Author	SHA1	Message	Date
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
Ulf Gebhardt	71551153c4	backend changes to rename login_pending_tasks_admin table to admin_pending_creations	2022-02-02 16:25:15 +01:00
Ulf Gebhardt	5bc23a4857	remove typeorm from backend project and reference the one installed in database. This way the default connection of the enteties can be used - this was not possible before since the connection waa created in the backend typeorm, but the entities are defined in the database installation. ... We now remove the typeorm from backend and rely solely on the database typeorm. We now can use both activeRecord and dataMapper pattern.	2022-02-01 04:14:54 +01:00
Ulf Gebhardt	654dd8de96	check right on sendActivationEmail	2022-02-01 02:59:19 +01:00
Alexander Friedland	cce9e2af67	Merge branch 'master' into fix-creation-for-not-checked-email	2022-01-27 14:09:25 +01:00
elweyn	6c81673a4b	Update creations of a user only if the old pending creation has the same month as the updated month. Throw exception before end of file.	2022-01-27 11:04:32 +01:00
elweyn	9e4d2498ca	Throw exception before continuing the bussiness logic.	2022-01-27 10:38:35 +01:00
elweyn	a12378ed8b	Checks if User has activated his Email before saving a open creation.	2022-01-27 10:33:06 +01:00
elweyn	d938814f1a	Check if user account is not disabled to make a creation.	2022-01-27 10:24:03 +01:00
elweyn	afbc52c2aa	Implemented a method to add back the summ to the creations array.	2022-01-26 20:10:11 +01:00
elweyn	190038eaa1	fix updatePendingCreation method logic, now it checks if the updated datas are allowed so that no user can get more than 1000 GDD per month.	2022-01-26 15:54:19 +01:00
Ulf Gebhardt	ab584c7250	reduced backend coverage, renamed test file apropriatly	2022-01-25 22:14:37 +01:00
Ulf Gebhardt	869d9e303d	disabled UserResolver.test	2022-01-25 22:06:29 +01:00
Ulf Gebhardt	a6bcd5d796	Merge branch 'master' into import_production_data	2022-01-25 13:57:47 +01:00
ogerly	c51758e597	remove division / 100 for GDT	2022-01-25 10:38:47 +01:00
Ulf Gebhardt	707d4ea489	removed console logs	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	1110a6fdef	minor changes + console logs for sending to debug the stage2 instance	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	138f09b4e0	unified the mnemonic lists and simplified code	2022-01-25 00:49:53 +01:00
Ulf Gebhardt	96b756227f	Merge branch 'master' into import_production_data	2022-01-25 00:49:53 +01:00
Ulf Gebhardt	fcf7a9fbca	fix broken login with existing token in local store	2022-01-20 17:51:45 +01:00
Ulf Gebhardt	777d1f2f43	missing nullable field definition	2022-01-20 14:08:32 +01:00
Ulf Gebhardt	eb33e5130a	regenerate passphrase if needed	2022-01-20 12:30:07 +01:00
Ulf Gebhardt	427608ada3	username is nullable	2022-01-19 21:42:25 +01:00
Ulf Gebhardt	723afb6402	make description field explicitly nullable and corrected graphql model accordingly	2022-01-19 14:44:56 +01:00
Moriz Wahl	2e25c280cf	Merge branch 'master' into paginate-user-table	2022-01-18 12:54:59 +01:00
Ulf Gebhardt	90effb41b5	changed syntax again due to shell replacing $variables	2022-01-14 18:49:35 +01:00
Moriz Wahl	d441931125	get pagination working	2022-01-14 13:13:48 +01:00
Ulf Gebhardt	5217b347be	replace all $1 url variables with something meaningfull, since $1 is replaced in scripting	2022-01-14 10:24:47 +01:00
Moriz Wahl	2b6dd2af87	implement fake pagination for searchUsers	2022-01-13 17:00:01 +01:00
Moriz Wahl	84104b7f0b	Merge branch 'master' into test-set-password	2022-01-13 10:35:01 +01:00
Moriz Wahl	25dbfef8a8	Merge branch 'master' into test-send-email	2022-01-13 10:12:19 +01:00
Moriz Wahl	8d800fc7da	test some error cases	2022-01-13 09:55:09 +01:00