3775 Commits

Author	SHA1	Message	Date
Claus-Peter Huebner	567d2399f7	rework PR-comments	2023-07-03 16:56:04 +02:00
Claus-Peter Huebner	3e5b7c9eec	Merge remote-tracking branch 'origin/master' into 3030-feature-role-administration-backend	2023-07-03 16:28:49 +02:00
Claus-Peter Huebner	4e9ed0726f	all tests solved	2023-07-03 16:26:16 +02:00
elweyn	0b4d7181be	Check that the message type is not MODERATOR before sending email.	2023-07-01 11:54:24 +02:00
elweyn	000ac24865	Test that their is no email send after a moderator message.	2023-07-01 11:53:54 +02:00
Claus-Peter Huebner	4ccf687a63	further solved tests	2023-06-30 23:29:57 +02:00
Claus-Peter Huebner	faf86f95b9	further solved tests	2023-06-30 23:23:35 +02:00
Claus-Peter Huebner	eb537301b8	Merge remote-tracking branch 'origin/master' into ... 3030-feature-role-administration-backend	2023-06-30 21:13:04 +02:00
Ulf Gebhardt	a8a751a9f0	v1.22.0	2023-06-30 19:52:03 +02:00
Hannes Heine	d045880aaf	Merge branch 'master' into fix-yarn-lock	2023-06-30 18:27:38 +02:00
Alexander Friedland	59ecc14b29	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-30 15:46:20 +02:00
Moriz Wahl	3486a95f19	Merge branch 'master' into user-query-on-find-contributions	2023-06-30 14:44:30 +02:00
Moriz Wahl	ef461dc969	Update backend/src/graphql/resolver/util/findContributions.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-06-30 14:32:09 +02:00
Ulf Gebhardt	751bac018a	yarn lock updated after typeorm upgrade	2023-06-30 14:26:39 +02:00
elweyn	db74bf0778	Fix error that resulted of merge conflict	2023-06-30 11:44:19 +02:00
Hannes Heine	a4ca612604	Merge branch 'master' into 2789-double-redeem-transaction-link	2023-06-30 10:58:13 +02:00
Alexander Friedland	3e32ffa123	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-30 10:48:57 +02:00
Claus-Peter Huebner	6189857ed4	solve some more testcases, but still problems with searchAdminUser and ... some more...	2023-06-30 03:10:14 +02:00
Moriz Wahl	6030ca0898	change state to status	2023-06-29 14:41:07 +02:00
Moriz Wahl	91fa7bfbfd	Merge branch 'master' into user-query-on-find-contributions	2023-06-29 13:45:53 +02:00
Moriz Wahl	3ed9adfc73	Merge branch 'master' into update-typeorm	2023-06-29 12:28:05 +02:00
elweyn	8c9b4614b2	Surrond the check if link is correct with the new semafore.	2023-06-29 12:12:49 +02:00
elweyn	74ce9b3067	Create a semafore lock for transaction links.	2023-06-29 12:09:42 +02:00
elweyn	77b7d5b414	Expect to receive an error on second call.	2023-06-29 12:09:07 +02:00
Claus-Peter Huebner	9830afb91c	further tests adapted	2023-06-29 00:00:35 +02:00
Claus-Peter Huebner	ddee5707f5	further tests adapted	2023-06-29 00:00:12 +02:00
Ulf Gebhardt	e05e4cbf37	Merge branch 'master' into fix-forget-password-deleted-user	2023-06-28 15:11:03 +02:00
Moriz Wahl	7192b666ee	test user query on find contribbutions	2023-06-28 14:36:33 +02:00
Ulf Gebhardt	3d4ee1de9f	Merge branch 'master' into fix-gdt-error	2023-06-28 14:35:55 +02:00
Moriz Wahl	32b6b0bee9	add query to find contributions, change relations to object notation	2023-06-28 14:26:46 +02:00
Moriz Wahl	abe1d1b71f	remove unused file	2023-06-28 13:56:08 +02:00
Moriz Wahl	d81d0cbd53	undo query changes	2023-06-28 13:08:41 +02:00
Moriz Wahl	c44807dd50	get most tests working again	2023-06-28 13:04:41 +02:00
Moriz Wahl	4771d2a0ca	Merge branch 'master' into message-type-admin	2023-06-28 12:46:10 +02:00
Moriz Wahl	44dedacce5	transaction link summary as function, seeds are working again	2023-06-28 12:16:38 +02:00
Ulf Gebhardt	31446aaa0e	do not allow to reset password when user is deleted	2023-06-28 11:16:48 +02:00
Alexander Friedland	929c176965	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-28 08:22:04 +02:00
Claus-Peter Huebner	9c9a05e64f	userRoles as OneToMany relation	2023-06-28 02:47:51 +02:00
Ulf Gebhardt	87e5b7437f	properly construct result objects, return an empty GDT list on success=false	2023-06-27 22:19:28 +02:00
Ulf Gebhardt	c5cbb9e120	rework GdtEntryList	2023-06-27 22:18:56 +02:00
Ulf Gebhardt	76603d82cf	rework GdtEntry	2023-06-27 22:18:44 +02:00
Ulf Gebhardt	ec50b98d73	Merge branch 'master' into eslint-jest-env	2023-06-27 20:51:19 +02:00
Moriz Wahl	689705f465	improved describe	2023-06-27 14:03:03 +02:00
Ulf Gebhardt	3cff9bce79	include jest environment	2023-06-27 12:23:18 +02:00
elweyn	48498ee729	Refactor state to status for contribution.	2023-06-27 10:04:21 +02:00
Claus-Peter Huebner	e2790a268e	modify tests, but still not working	2023-06-27 02:53:17 +02:00
Claus-Peter Huebner	2ca9af9cbf	load userRole in findUserByEmail()	2023-06-27 02:44:27 +02:00
Claus-Peter Huebner	37b2e659f0	add userRole relations	2023-06-27 02:42:42 +02:00
Claus-Peter Huebner	35eef52aef	add "isModerator" in graphql model	2023-06-27 02:39:01 +02:00
Moriz Wahl	642d2202bf	try to get repository working again	2023-06-26 17:34:32 +02:00