3036 Commits

Author	SHA1	Message	Date
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
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
Hannes Heine	95583bda1c	Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution	2023-02-17 12:12:18 +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
elweyn	d32b520145	Change test description to better naming.	2023-02-15 10:00:30 +01:00
elweyn	34fe6b4e90	Rework reviews, add the properties used in the ui for listContributions.	2023-02-15 09:44:00 +01:00
Hannes Heine	38b7234d96	Merge branch 'master' into refactor-deny-contribution-unit-test	2023-02-15 09:23:08 +01:00
Claus-Peter Hübner	ef2f8da826	linting	2023-02-14 22:00:12 +01:00
clauspeterhuebner	270a73689d	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-02-14 21:24:03 +01:00
Ulf Gebhardt	ea42ac6a40	Merge branch 'master' into logger_creations	2023-02-14 20:14:16 +01:00
Moriz Wahl	7c2bf9da7a	Merge branch 'master' into 2594-contributions-list-frontend	2023-02-14 17:59:34 +01:00
clauspeterhuebner	92543a420d	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-02-14 17:36:28 +01:00
Ulf Gebhardt	4864ad6276	Merge branch 'master' into logger_transactionResolver	2023-02-14 17:11:48 +01:00
clauspeterhuebner	cf0f4cd241	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-02-14 17:11:24 +01:00
Moriz Wahl	ddbdbe4224	Merge branch 'master' into 2594-contributions-list-frontend	2023-02-14 17:05:11 +01:00
Ulf Gebhardt	70c6d3b026	Merge branch 'master' into event_protocol_rework	2023-02-14 16:20:36 +01:00
Ulf Gebhardt	18242ccfea	Merge branch 'master' into logger_transactionResolver	2023-02-14 16:18:29 +01:00
Ulf Gebhardt	d85c34a76e	Merge branch 'master' into logger_transactionLinkResolver	2023-02-14 15:53:07 +01:00
Ulf Gebhardt	d0ff8ffb2c	diferentiate between saving and not saving event	2023-02-14 15:50:25 +01:00
Ulf Gebhardt	9101c3f74d	save moderator & user_id for EVENT_ADMIN_CONTRIBUTION_DENY	2023-02-14 15:39:41 +01:00
elweyn	6851ef3f62	Merge master in here.	2023-02-14 10:22:51 +01:00
Hannes Heine	833271a76c	Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password	2023-02-14 08:11:59 +01:00
Hannes Heine	bb926b2454	Merge branch 'master' into 2366-devopsbackend-have-yarn-locales-fix-in-the-backend	2023-02-14 07:57:26 +01:00
elweyn	a615c741c2	Add tests that EVENT is stored in DB and has right values in userId.	2023-02-14 07:55:38 +01:00
Ulf Gebhardt	2a1cb037c7	log moderator who denies contribution instead of user	2023-02-14 01:47:07 +01:00
Claus-Peter Hübner	f3a72b2545	add TODO comment for reminding event-based communication	2023-02-13 22:27:40 +01:00
Claus-Peter Hübner	70276800e6	rework PR-comments	2023-02-13 22:19:52 +01:00