2034 Commits

Author SHA1 Message Date
a448272620
fixed build type check 2023-03-10 15:25:36 +01:00
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
becabb861c
fix types 2023-03-09 14:41:35 +01:00
b530576a84
revert regex.exec to string.match 2023-03-09 14:37:26 +01:00
09d2db3028
unsaved changes, include float from type-graphql 2023-03-09 14:37:26 +01:00
230a47d32b
GDT Balance returns float 2023-03-09 14:37:26 +01:00
18491cc380
timeUsed is a float 2023-03-09 14:37:25 +01:00
2783a6c62e
gdtSum is float 2023-03-09 14:37:25 +01:00
16914e3d98
gdt balance is a float 2023-03-09 14:37:25 +01:00
19adc53ed7
fix newly introduced errors 2023-03-09 14:37:25 +01:00
827c829306
fixes based on the unit tests 2023-03-09 14:37:25 +01:00
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
12f4e9fda1
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-06 16:47:18 +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
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
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
dec47d6dc5
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-23 22:07:08 +01:00
75d23c5daf
corrected return type of listTransactionLinks 2023-02-23 21:36:59 +01:00
Moriz Wahl
bee05397d2 fix test 2023-02-21 15:28:18 +01:00
Moriz Wahl
6e88068a88 Merge branch 'master' into remove-adminCreateContributions 2023-02-21 15:20:45 +01:00
Hannes Heine
1e7d4a779a
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-21 04:02:55 +01:00
Moriz Wahl
72165ac99d fix test 2023-02-20 14:39:05 +01:00
Moriz Wahl
3cc5494736 refactor(backend): remove admin create contributions 2023-02-20 14:24:42 +01:00
Hannes Heine
2a12d03599
Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-18 07:14:07 +01:00
elweyn
bf5cb142cc Remove unused In import. 2023-02-18 07:13:35 +01:00
16c3ba399e
some misssing changes 2023-02-17 23:21:37 +01:00
b887068226
remove user constant, not required 2023-02-17 23:12:11 +01:00
d21996a045
externalize transactionLinkList function into utils folder 2023-02-17 23:10:31 +01:00
12c128e072
do not requqery the user 2023-02-17 23:03:38 +01:00