3077 Commits

Author SHA1 Message Date
Moriz Wahl
bb1f247126
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-07 17:03:22 +01:00
elweyn
d00bfec5a6 Set new release version. 2023-03-07 14:15:17 +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
8c2260719c
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution 2023-03-02 14:11:37 +01:00
Hannes Heine
d2afaad938
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution 2023-03-01 17:06:09 +01:00
mahula
6ec9d9120e
Merge branch 'master' into set-EMAIL_TLS-true 2023-03-01 10:45:50 +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
ed7cf461fb fix(backend): set email tls true in test 2023-02-28 21:06:51 +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
Wolfgang Huß
a8d382b8d7 Fix tests 2023-02-28 14:37:51 +01:00
Wolfgang Huß
1055396d20 Change menu and tab titles in email to the new design 2023-02-28 14:37:41 +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
23abbfa658 remove adminCreateContributions mutation 2023-02-20 14:59:57 +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
elweyn
a61e66ffc4 Refactor the near functions to a single one. 2023-02-17 16:12:26 +01:00
elweyn
84c724daea Change to suggestion 2023-02-17 15:51:45 +01:00
elweyn
9ddef04f56 Change test name. 2023-02-17 15:46:53 +01:00
9de2149c8f
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-17 14:10:51 +01:00
elweyn
ef5bd33245 Merge branch 'refactor-listUnconfirmedContribution-to-adminListAllContribution' of https://github.com/gradido/gradido into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-17 13:57:59 +01:00
elweyn
a54f171154 Remove console.log statement to test. 2023-02-17 13:57:02 +01:00
Hannes Heine
e2ac359386
Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-17 13:56:18 +01:00
elweyn
17f17663f9 Merge branch 'refactor-listUnconfirmedContribution-to-adminListAllContribution' of https://github.com/gradido/gradido into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-17 13:54:49 +01:00
elweyn
62284bd016 Set test for adminListAllContributions at the end of the admin szenario. 2023-02-17 13:54:39 +01:00
elweyn
3476f680ed Remove QueryBuilder and rewrite it with ContributionEntity.findAndCount method. 2023-02-17 13:53:58 +01:00
0fed2002b4
Merge branch 'master' into authenticated_tests_for_TransactionLinkResolver 2023-02-17 12:25:24 +01:00
Hannes Heine
95583bda1c
Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-17 12:12:18 +01:00
09dc5ffdcb
merge conflict 2023-02-17 12:09:24 +01:00
d26c0bd78a
Merge branch 'master' into authenticated_tests_for_TransactionLinkResolver 2023-02-17 12:09:12 +01:00
5560163736
Merge branch 'master' into logger_errors 2023-02-17 12:08:45 +01:00
1a8e98cce9
Merge branch 'master' into logger_encryptorUtils 2023-02-17 11:33:38 +01:00