61 Commits

Author	SHA1	Message	Date
Moriz Wahl	bd6e5a2679	Merge branch 'master' into test-admin-resolver	2022-04-28 16:14:07 +02:00
Moriz Wahl	a0e29e2524	remove moderator from update pending creation mutation args	2022-04-27 12:06:01 +02:00
Moriz Wahl	64454b6fa2	remove moderator from create pending creation mutation args, use context instead to get moderator ID	2022-04-27 11:11:30 +02:00
Wolfgang Huß	ee18ae41b9	Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted	2022-04-27 09:24:20 +02:00
Ulf Gebhardt	56ed35d692	backend fix types for admin_pending_creations is now decimal	2022-04-21 13:49:29 +02:00
Wolfgang Huß	0c0bfe1a10	Rename to filterByActivated and filterByDeleted	2022-04-21 10:52:11 +02:00
Wolfgang Huß	621786c91d	Rename after suggestion emailChecked withActivated and deletedAt to withDeleted	2022-04-21 07:54:41 +02:00
Wolfgang Huß	e8aba86430	Rename isDeleted to deletedAt	2022-04-20 08:53:12 +02:00
Wolfgang Huß	03e1624c11	Rename isEmailChecked to emailChecked	2022-04-20 08:48:13 +02:00
Wolfgang Huß	145989e284	Replace notActivated by isEmailChecked	2022-04-19 14:43:25 +02:00
Ulf Gebhardt	d95e4d864a	Merge branch 'master' into mass_creation_do_not_show_unactivated	2022-03-29 12:43:13 +02:00
Ulf Gebhardt	33638598a0	notActivated & isDeleted are both nullable ... Admin User Search is a nightmare codewise	2022-03-25 13:43:53 +01:00
Alexander Friedland	1680a15b8a	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-23 20:16:25 +01:00
Ulf Gebhardt	c0c6630873	make redeemCode nullable	2022-03-23 19:59:29 +01:00
Moriz Wahl	d1770ccb1a	default values for filters	2022-03-23 08:20:37 +01:00
Moriz Wahl	d0b2a28ae2	add simple filter for list transaction link admin query	2022-03-23 07:43:16 +01:00
Moriz Wahl	9c8599528e	allow null for redeemCode	2022-03-22 19:24:58 +01:00
ogerly	1f1cd67b9e	add redeemCode	2022-03-21 10:29:13 +01:00
Moriz Wahl	577ca00c46	refactor transaction list query, do not allow user id an only creations as args any more. this query only return the transactions of the logged in user	2022-03-17 10:46:29 +01:00
Moriz Wahl	428e29f5d9	refactor: Transaction Link Query	2022-03-11 11:55:06 +01:00
Moriz Wahl	5300f5db12	Merge branch 'master' into remove-showEmail	2022-03-11 11:15:33 +01:00
elweyn	280de3df9e	Add Args for the queryTransactionLink.	2022-03-10 21:36:53 +01:00
Moriz Wahl	55455d0236	remove showEmail form model, args and resolver	2022-03-10 18:31:15 +01:00
Moriz Wahl	1a715f8b71	simple resolver for createTransactionLink	2022-03-09 14:30:25 +01:00
Moriz Wahl	f0e7cc2a50	resolve relative paths in arg	2022-03-07 21:42:57 +01:00
Ulf Gebhardt	e988cf9371	defining precision in config seems to work properly afterall	2022-02-27 13:05:27 +01:00
Ulf Gebhardt	9c27568f77	include decimal with precision definition	2022-02-27 03:09:18 +01:00
Ulf Gebhardt	7644bf1834	backend compiles	2022-02-26 03:42:20 +01:00
ogerly	3b656898e1	add isDeleted in backend, delete and undelete is activ by return	2022-02-22 14:45:43 +01:00
Ulf Gebhardt	817e462698	fixed backend according to migration	2022-02-07 05:01:49 +01:00
Moriz Wahl	2b6dd2af87	implement fake pagination for searchUsers	2022-01-13 17:00:01 +01:00
Hannes Heine	634d2278b2	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-22 15: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
Hannes Heine	7716863f90	Merge branch 'master' into 1165-refactor-admin-interface	2021-12-21 11:51:34 +01:00
Hannes Heine	2574b2c661	Merge branch 'master' into adminCreateMultiplePendingCreations	2021-12-21 09:15:34 +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
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	9237f139f2	Error in UpdatePendingCreationArgs changed export name, Added an InputType over the ArgsType for the CreatePendingCreationArgs, added a createPendingCreations mutation that creates multiple PendingCreation.	2021-12-09 11:13:07 +01:00
Ulf Gebhardt	452beec07c	Merge branch 'master' into login_call_resetPassword	2021-12-07 00:26:23 +01:00
Ulf Gebhardt	bbd54ef607	Merge branch 'master' into login_call_resetPassword	2021-12-06 13:42:48 +01:00
Hannes Heine	4c2e51b517	Update pending creation	2021-12-01 15:43:22 +01:00
elweyn	e2743b979e	Change note to memo.	2021-11-30 10:08:12 +01:00
Hannes Heine	927c61ae6e	Merge branch 'master' into admin_pending_creation	2021-11-26 06:52:26 +01:00
Ulf Gebhardt	5cccd8f873	Merge branch 'master' into login_call_resetPassword ... # Conflicts: # backend/src/graphql/resolver/UserResolver.ts	2021-11-26 02:36:32 +01:00
Hannes Heine	33c50560d6	creationDate to string and changed the other parameters to int	2021-11-25 12:06:14 +01:00
Hannes Heine	5cbdbcb7c9	Merge branch 'master' into login_call_resetPassword	2021-11-25 10:22:15 +01:00
Hannes Heine	03cb7fa558	Create entry in LoginPendingTaskAdmin table. Save creation in database.	2021-11-25 10:15:34 +01:00