2336 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	69ae2e91f0	fix message count on moderator message contributions (filter out MODERATOR messages)	2023-07-05 09:37:35 +02:00
Ulf Gebhardt	d1ba7c7f41	do not change contribution status on moderator message	2023-07-05 09:05:20 +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
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
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
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	77b7d5b414	Expect to receive an error on second call.	2023-06-29 12:09:07 +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	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
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
Moriz Wahl	689705f465	improved describe	2023-06-27 14:03:03 +02:00
elweyn	48498ee729	Refactor state to status for contribution.	2023-06-27 10:04:21 +02:00
Moriz Wahl	642d2202bf	try to get repository working again	2023-06-26 17:34:32 +02:00
Moriz Wahl	95e7888d90	try to get unit tests and seeds running again	2023-06-26 15:57:43 +02:00
Moriz Wahl	27006be4ae	undo changed comming from user query for find contributions	2023-06-26 14:21:35 +02:00
Moriz Wahl	e35104faa8	get backend running with new typeorm version	2023-06-26 13:59:42 +02:00
Moriz Wahl	89a6305c45	feat(database): update typeorm	2023-06-26 13:12:42 +02:00
Moriz Wahl	f0eae909b9	fix authentication test	2023-06-20 13:16:35 +02:00
Moriz Wahl	1e6d4cfe4b	add admin list contribution message query	2023-06-20 13:11:36 +02:00
Moriz Wahl	4d119f8911	find contribution messages helper function	2023-06-20 12:44:35 +02:00
Moriz Wahl	732560aaac	add message type arg to admin create contribution message	2023-06-20 12:11:44 +02:00
Moriz Wahl	65965a2ffd	add MODERATOR contribution message type	2023-06-20 11:34:48 +02:00
Ulf Gebhardt	6c8a56cece	Merge branch 'master' into remove-klicktipp-middleware	2023-06-15 20:02:46 +02:00
Ulf Gebhardt	c7f316f61c	Merge branch 'master' into remove-klicktipp-middleware	2023-06-15 19:55:19 +02:00
Ulf Gebhardt	df60b120c8	Merge branch 'master' into admin-order-usersearch-desc	2023-06-15 15:04:35 +02:00
Ulf Gebhardt	59a16a8c46	refactor query	2023-06-14 13:45:02 +02:00
Ulf Gebhardt	e412265b3a	refactor user resolver	2023-06-14 13:44:01 +02:00
mahula	dfaa7e3aed	linting	2023-06-13 12:04:45 +02:00
mahula	6f611f3a07	add alias to backend's createUser for seeding	2023-06-13 11:40:49 +02:00
Ulf Gebhardt	d536a4b689	lint fixes	2023-06-09 13:09:07 +02:00
clauspeterhuebner	82158a722a	Merge branch 'master' into remove-klicktipp-middleware	2023-06-09 12:09:55 +02:00
Ulf Gebhardt	78675f37dc	Merge branch 'master' into sodium-native-new-pr	2023-06-08 14:32:04 +02:00
Ulf Gebhardt	676cf779c7	removed middleware and replace it with a function	2023-06-07 10:51:45 +02:00