218 Commits

Author	SHA1	Message	Date
Alexander Friedland	59ecc14b29	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-30 15:46:20 +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	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
Moriz Wahl	32b6b0bee9	add query to find contributions, change relations to object notation	2023-06-28 14:26:46 +02:00
Moriz Wahl	d81d0cbd53	undo query changes	2023-06-28 13:08: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
Alexander Friedland	929c176965	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-28 08:22:04 +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	e35104faa8	get backend running with new typeorm version	2023-06-26 13:59:42 +02:00
Moriz Wahl	1e6d4cfe4b	add admin list contribution message query	2023-06-20 13:11:36 +02:00
Moriz Wahl	732560aaac	add message type arg to admin create contribution message	2023-06-20 12:11:44 +02:00
Ulf Gebhardt	59a16a8c46	refactor query	2023-06-14 13:45:02 +02:00
mahula	1a9cef86ed	add alias to user Bob der Baumeister for seeding	2023-06-13 11:40:49 +02:00
mahula	6f611f3a07	add alias to backend's createUser for seeding	2023-06-13 11:40:49 +02:00
Moriz Wahl	c5eb9311e6	test check username query	2023-05-15 22:47:19 +02:00
Moriz Wahl	e83c06a419	Merge branch 'master' into alias-update-user-info	2023-05-10 17:37:48 +02:00
Ulf Gebhardt	2545f1342e	fix security issue	2023-05-10 12:14:13 +02:00
Ulf Gebhardt	49976b30b7	fix problems	2023-05-09 12:20:28 +02:00
Moriz Wahl	3b7f565b02	Merge branch 'master' into alias-update-user-info	2023-05-08 14:33:42 +02:00
Moriz Wahl	ad4418d297	test transaction list query to raise coverage	2023-05-08 09:35:14 +02:00
Moriz Wahl	c42ee8d264	Merge branch 'master' into no-email-in-user	2023-05-08 08:55:18 +02:00
Hannes Heine	b4a497e158	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-05-04 11:28:42 +02:00
Ulf Gebhardt	70cf72a4c1	Merge branch 'master' into eslint-disable-more-typesafety	2023-05-03 12:37:19 +02:00
Moriz Wahl	8370b4f273	test user resolver returns no emails	2023-04-18 16:25:02 +02:00
Hannes Heine	575d3a11a4	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-04-06 15:14:20 +02:00
elweyn	c3a47460da	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-04-06 15:02:08 +02:00
Ulf Gebhardt	657c171898	merge	2023-04-06 14:05:50 +02:00
Ulf Gebhardt	56dbcd4f58	various more typesafety	2023-04-05 05:46:38 +02:00
Ulf Gebhardt	7a44a223e9	lint fixes	2023-03-31 12:51:51 +02:00
Ulf Gebhardt	ae8405e8f6	merge	2023-03-31 12:48:09 +02:00
elweyn	0345e8420d	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-31 07:27:58 +02:00
Moriz Wahl	976940047e	Merge branch 'master' into feat-send-coins-via-gradido-ID	2023-03-30 19:14:09 +02:00
Moriz Wahl	d3ac556885	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-30 18:26:02 +02:00
Moriz Wahl	6dff07a7ba	Revert "do not allow user to edit admin contributions" ... This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.	2023-03-30 18:25:47 +02:00
Ulf Gebhardt	7d7eb34aeb	fix order	2023-03-30 18:04:43 +02:00
Ulf Gebhardt	9407386de7	fix alphabetical sort	2023-03-30 17:57:15 +02:00
Ulf Gebhardt	80ff97e72a	more lint fixes	2023-03-30 17:39:09 +02:00
Ulf Gebhardt	b0c19eda47	fix import order	2023-03-30 17:28:03 +02:00
elweyn	c07582d5a1	Merge & linting	2023-03-30 16:44:17 +02:00
Moriz Wahl	43e2f5fbc8	do not allow user to edit admin contributions	2023-03-30 16:40:07 +02:00
Hannes Heine	b67baf665b	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-30 16:37:03 +02:00
elweyn	ff7a73048c	Correct mutations in testing	2023-03-30 16:29:35 +02:00
Moriz Wahl	10022c2247	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-30 15:11:18 +02:00
Ulf Gebhardt	c874fb6ca1	Merge branch 'master' into eslint-plugin-import-fixes	2023-03-28 01:08:16 +02:00
Moriz Wahl	2ac94e1b47	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-23 13:17:02 +01:00
Moriz Wahl	9c84ca185d	Merge branch 'master' into feat-send-coins-via-gradido-ID	2023-03-23 13:15:47 +01:00