2049 Commits

Author	SHA1	Message	Date
Moriz Wahl	b27db4eeaf	Merge branch 'master' into refactor-find-contribtiions	2023-03-21 14:37:07 +01:00
Ulf Gebhardt	d790e9cfcf	lint fix	2023-03-14 20:08:11 +01:00
Ulf Gebhardt	e8114e4083	remove mul -1 for congruency	2023-03-14 20:04:28 +01:00
Ulf Gebhardt	bfa8f33ea6	merge conflict	2023-03-14 16:08:57 +01:00
Ulf Gebhardt	b3c48af3c4	Merge branch 'master' into event_refactor_database	2023-03-14 16:08:41 +01:00
Moriz Wahl	4bcc0e19e8	Merge branch 'master' into refactor-find-contribtiions	2023-03-14 11:31:27 +01:00
Moriz Wahl	84a6eccd49	Merge branch 'master' into test-transaction-links	2023-03-10 15:36:04 +01:00
Ulf Gebhardt	a448272620	fixed build type check	2023-03-10 15:25:36 +01:00
Ulf Gebhardt	d5ec495785	Merge branch 'master' into refactor-find-contribtiions	2023-03-10 15:09:32 +01:00
Moriz Wahl	66bfd6c884	what the fuck	2023-03-10 15:03:46 +01:00
Moriz Wahl	8dfafaea89	Merge branch 'master' into admin-open-creations-query	2023-03-10 14:49:32 +01:00
Moriz Wahl	d4d38e29b6	Merge branch 'master' into refactor-find-contribtiions	2023-03-10 14:42:43 +01:00
Moriz Wahl	2af31b6bfd	better arg name	2023-03-10 11:59:01 +01:00
Moriz Wahl	73fb123036	admin open creations query	2023-03-10 11:55:24 +01:00
Ulf Gebhardt	becabb861c	fix types	2023-03-09 14:41:35 +01:00
Ulf Gebhardt	b530576a84	revert regex.exec to string.match	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	09d2db3028	unsaved changes, include float from type-graphql	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	230a47d32b	GDT Balance returns float	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	18491cc380	timeUsed is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	2783a6c62e	gdtSum is float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	16914e3d98	gdt balance is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	19adc53ed7	fix newly introduced errors	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	827c829306	fixes based on the unit tests	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	3391b3a9ee	merge	2023-03-09 14:37:17 +01:00
elweyn	775d29fb68	Add messageCount value to the contributions that got messages, order the objects in the same order as they are found.	2023-03-08 14:29:25 +01:00
elweyn	747c146bbf	Add to database query relation messages	2023-03-08 12:33:15 +01:00
Moriz Wahl	5d6caee37d	remove creation transaction list	2023-03-07 17:56:25 +01:00
Moriz Wahl	ecd9efac4f	add optional arg user id to admin list contributions query	2023-03-07 17:47:11 +01:00
Moriz Wahl	e48bbd7b47	rename admin list all contributions query	2023-03-07 17:33:18 +01:00
Moriz Wahl	b604be5847	object as arg for find contributions	2023-03-07 17:16:53 +01:00
Moriz Wahl	74138dbef3	Merge branch 'use-find-contributions-for-list-contributions'	2023-03-07 17:04:12 +01:00
Moriz Wahl	a49251205f	test double redeem of transaction link	2023-03-07 16:24:17 +01:00
Moriz Wahl	ec87bea836	feat(backend): test transaction links	2023-03-07 14:31:24 +01:00
Moriz Wahl	12f4e9fda1	Merge branch 'master' into use-find-contributions-for-list-contributions	2023-03-06 16:47:18 +01:00
Ulf Gebhardt	5515088929	removed obsolete todo	2023-03-04 00:38:08 +01:00
Ulf Gebhardt	4379668268	Merge branch 'master' into event_refactor_database	2023-03-03 23:55:24 +01:00
Hannes Heine	1c312488a4	Merge branch 'master' into deleted-contributions-in-admin-interface	2023-03-02 15:29:43 +01:00
Hannes Heine	d2afaad938	Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution	2023-03-01 17:06:09 +01:00
elweyn	9fc1e45ed0	Merge branch '2689-test-email-send-deny-deleted-contribution' of https://github.com/gradido/gradido into 2689-test-email-send-deny-deleted-contribution	2023-03-01 05:21:03 +01:00
elweyn	becd9e44ea	Remove await before sendContributionDeletedEmail	2023-03-01 05:20:25 +01:00
elweyn	3a6b701d3b	Reduce mock of emails sendEmailVariant.	2023-03-01 05:16:37 +01:00
Hannes Heine	bfbf7954e3	Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution	2023-03-01 05:03:44 +01:00
Moriz Wahl	e4a9533802	refactor(backend): use find contributions helper in list contributions	2023-02-28 20:36:23 +01:00
Moriz Wahl	be048be032	fix(backend): possible flaky test	2023-02-28 19:53:35 +01:00
Moriz Wahl	f83c364d1d	feat(admin): deleted contributions visible	2023-02-28 17:19:12 +01:00
Ulf Gebhardt	21b6e35391	Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin	2023-02-27 15:53:59 +01:00
Ulf Gebhardt	5f8702c3c4	catch error for not existing users and test this	2023-02-27 15:44:14 +01:00
elweyn	cc6d781c22	Add tests that emails are send for denied and deleted contributions.	2023-02-24 08:36:06 +01:00
Ulf Gebhardt	dec47d6dc5	Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin	2023-02-23 22:07:08 +01:00
Ulf Gebhardt	75d23c5daf	corrected return type of listTransactionLinks	2023-02-23 21:36:59 +01:00