347 Commits

Author	SHA1	Message	Date
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	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +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
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	a334c916fd	fixed business logic with only one user	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	8005b700c3	removed references and implemented implicit active record queries	2022-02-02 19:54:47 +01:00
Ulf Gebhardt	736310f5d5	fix build error - type errors	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
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
Moriz Wahl	d441931125	get pagination working	2022-01-14 13:13:48 +01:00
Moriz Wahl	2b6dd2af87	implement fake pagination for searchUsers	2022-01-13 17:00:01 +01:00
Moriz Wahl	814f9e18dd	fix update of open creations	2022-01-10 13:25:35 +01:00
Moriz Wahl	55d85a8ccf	fix: Change Password in User Profile	2022-01-10 10:01:47 +01:00
elweyn	8053033c52	Fix linting.	2022-01-03 08:24:14 +01:00
Hannes Heine	a3f56832ef	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-30 14:25:53 +01:00
Alexander Friedland	4330b9d760	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-30 14:14:17 +01:00
elweyn	c31c8b28f2	Adding right to confirm pending creation.	2021-12-30 14:01:34 +01:00
elweyn	2f59ecae50	Adding right to delete pending creation.	2021-12-30 14:00:53 +01:00
elweyn	e440bb10b7	Adding right to search pending creation.	2021-12-30 13:59:39 +01:00
elweyn	56021489f8	Adding right to update pending creation.	2021-12-30 13:58:47 +01:00
elweyn	6e27c31d3c	Adding right to create pending creation.	2021-12-30 13:57:28 +01:00
Hannes Heine	b9efa4b048	Merge branch 'master' into remove_self_creation_confirmation	2021-12-30 13:50:50 +01:00
Moriz Wahl	6a666edc9f	test account activation email is sent	2021-12-27 20:48:39 +01:00
elweyn	dae95c7f65	Authorized function for each AdminResolver funktions, adding a check that pendingCreation userId different from moderator id.	2021-12-27 10:19:11 +01:00
Hannes Heine	634d2278b2	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-22 15:38:18 +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
elweyn	967e47908a	Remove the console.log, remove unused Int.	2021-12-21 15:39:53 +01:00
elweyn	84b81f6dc4	Remove console.log and commented code.	2021-12-21 14:38:18 +01:00
Hannes Heine	003c534f47	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-21 13:17:11 +01:00
elweyn	51168b9ab0	Merge changes on the UserResolver with the changes in master.	2021-12-21 12:32:46 +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
ogerly	8e974bbc22	Check for emailChecked in the user search and giving the value to the UserTable	2021-12-20 10:01:53 +01:00
Hannes Heine	04bea42261	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-20 09:11:47 +01:00
Hannes Heine	fedd1d626d	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-17 08:47:59 +01:00