3062 Commits

Author	SHA1	Message	Date
Moriz Wahl	be048be032	fix(backend): possible flaky test	2023-02-28 19:53:35 +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
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
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
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
Ulf Gebhardt	16c3ba399e	some misssing changes	2023-02-17 23:21:37 +01:00
Ulf Gebhardt	b887068226	remove user constant, not required	2023-02-17 23:12:11 +01:00
Ulf Gebhardt	d21996a045	externalize transactionLinkList function into utils folder	2023-02-17 23:10:31 +01:00
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	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
Ulf Gebhardt	09dc5ffdcb	merge conflict	2023-02-17 12:09:24 +01:00
Ulf Gebhardt	d26c0bd78a	Merge branch 'master' into authenticated_tests_for_TransactionLinkResolver	2023-02-17 12:09:12 +01:00
Ulf Gebhardt	5560163736	Merge branch 'master' into logger_errors	2023-02-17 12:08:45 +01:00
Ulf Gebhardt	1a8e98cce9	Merge branch 'master' into logger_encryptorUtils	2023-02-17 11:33:38 +01:00
Hannes Heine	a15b3265de	Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution	2023-02-17 11:33:29 +01:00
elweyn	b1b3a060cb	Merge master in refactor adminListContributions.	2023-02-17 11:20:43 +01:00
Ulf Gebhardt	9fbce956df	missing merge change	2023-02-16 18:22:47 +01:00
Ulf Gebhardt	aa0b3ad671	Merge branch 'master' into logger_creations	2023-02-16 18:19:40 +01:00
Ulf Gebhardt	6bf906894a	Merge branch 'master' into refactor-deny-contribution-unit-test	2023-02-16 15:46:44 +01:00
elweyn	40b2944b24	Check toEqual.	2023-02-16 15:41:04 +01:00
Ulf Gebhardt	a5d7582426	Merge branch 'master' into logger_creations	2023-02-16 14:23:02 +01:00
Ulf Gebhardt	de83f241d8	Update backend/src/graphql/resolver/TransactionLinkResolver.test.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-02-16 14:22:56 +01:00
mahula	b0b0275b01	Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password	2023-02-16 14:16:25 +01:00
mahula	d68c43c10b	Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password	2023-02-16 14:02:09 +01:00
Moriz Wahl	1933bca019	Merge branch 'master' into 2594-contributions-list-frontend	2023-02-16 13:50:47 +01:00
Alexander Friedland	1cf217b1f0	Merge branch 'master' into 2594-contributions-list-frontend	2023-02-15 14:55:28 +01:00
elweyn	b9c46d2238	Correct spelling error.	2023-02-15 12:33:13 +01:00
elweyn	00a45d7805	Corrected the expected amount from the ADMIN_CONTRIBUTION_DELETE event.	2023-02-15 12:17:17 +01:00
elweyn	11f19262b0	Add expected data to Protocols tests.	2023-02-15 11:40:02 +01:00