1720 Commits

Author	SHA1	Message	Date
elweyn	10abf45e15	Merge dissolve_admin_resolver to local branch.	2022-12-14 11:04:16 +01:00
Ulf Gebhardt	330f85e04e	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.ts	2022-12-13 16:20:30 +01:00
Moriz Wahl	02656ee117	fix tests after merge	2022-12-13 15:49:41 +01:00
Moriz Wahl	98742c0db1	Merge branch 'master' into test-validation-of-optin-codes	2022-12-13 14:57:15 +01:00
elweyn	ca01e34394	Get adminUser and find contribution with specific id.	2022-12-13 10:17:35 +01:00
elweyn	30c72bb734	Setup rejecctContribution method.	2022-12-13 10:10:42 +01:00
Hannes Heine	4be546c68e	Merge branch 'master' into dissolve_admin_resolver	2022-12-13 09:01:44 +01:00
Ulf Gebhardt	a82e1877a8	Merge branch 'master' into log-client-timezone-offset	2022-12-09 14:14:23 +01:00
Ulf Gebhardt	052f31d8ec	lint	2022-12-09 14:10:46 +01:00
Ulf Gebhardt	7638d29052	merge	2022-12-09 14:09:43 +01:00
Ulf Gebhardt	903fe56f60	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.test.ts # backend/src/graphql/resolver/AdminResolver.ts # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-09 14:09:33 +01:00
Ulf Gebhardt	486777cb35	Merge branch 'master' into 2392-refactor-more-emails-to-translatables	2022-12-09 12:59:59 +01:00
Moriz Wahl	61ecfa22fd	Merge branch 'master' into log-client-timezone-offset	2022-12-08 19:13:26 +01:00
Moriz Wahl	3051d8f070	Merge branch 'master' into fix-delete-email-contact	2022-12-08 19:11:18 +01:00
Moriz Wahl	cbb688112f	Update backend/src/graphql/resolver/AdminResolver.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-12-08 19:11:09 +01:00
Moriz Wahl	bd3f05d6c8	Update backend/src/graphql/resolver/AdminResolver.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-12-08 19:11:01 +01:00
Moriz Wahl	7174bec2f3	Merge branch 'master' into test-validation-of-optin-codes	2022-12-08 19:10:21 +01:00
elweyn	d52f7f9590	change transactionLinkId to linkId.	2022-12-06 12:20:21 +01:00
elweyn	ffb5988760	Refactoring of some small smelling code.	2022-12-06 11:58:17 +01:00
Ulf Gebhardt	20146908fa	Merge branch 'master' into test-validation-of-optin-codes	2022-12-05 12:13:51 +01:00
Ulf Gebhardt	9f6038b748	Merge branch 'master' into fix-delete-email-contact	2022-12-05 12:00:55 +01:00
Ulf Gebhardt	80d3a7bb18	Merge branch 'master' into 2392-refactor-more-emails-to-translatables	2022-12-02 11:59:03 +01:00
Ulf Gebhardt	ac578b3f10	Merge branch 'master' into dissolve_admin_resolver	2022-12-01 21:45:19 +01:00
Moriz Wahl	2caa0ad4c9	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 18:46:24 +01:00
Moriz Wahl	d3678bb81c	feat(backend): log client timezone offset	2022-12-01 17:44:56 +01:00
Moriz Wahl	41495c2c65	fix(backend): run all timers for high values	2022-12-01 15:53:09 +01:00
elweyn	0b2887b86f	Correct joins between contribution and transaction	2022-12-01 15:21:49 +01:00
elweyn	ec396e8521	Merge master.	2022-12-01 12:45:15 +01:00
elweyn	96fd4cb14c	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 12:07:52 +01:00
elweyn	46014adc6d	Database join contribution to transaction table, add new join to query.	2022-12-01 12:07:25 +01:00
Moriz Wahl	796f5af2c6	remove unused function, count resent by admin	2022-11-30 14:45:02 +01:00
Moriz Wahl	bbd163f1e0	integrate export const checkEmailVerificationCode = async (	2022-11-30 14:34:09 +01:00
Moriz Wahl	10781b2e6b	Merge branch 'master' into test-validation-of-optin-codes	2022-11-30 14:15:21 +01:00
Moriz Wahl	bc20bfa8f6	fix(backend): delete / undelete email contact as well	2022-11-30 12:46:46 +01:00
Moriz Wahl	c0096aa26c	fix(backend): critical bug	2022-11-30 12:15:47 +01:00
Ulf Gebhardt	7f9190f276	lint fix	2022-11-29 06:31:57 +01:00
Ulf Gebhardt	fa5b7e6b81	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.test.ts # backend/src/graphql/resolver/UserResolver.ts	2022-11-29 06:15:31 +01:00
Wolfgang Huß	dc7957a0fb	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables ... # Conflicts: # backend/src/util/utilities.ts	2022-11-28 11:22:25 +01:00
Wolfgang Huß	3903e29e16	Refactor 'sendTransactionReceivedEmail' email to HTML and translatable	2022-11-28 10:54:10 +01:00
Wolfgang Huß	224613f6d4	Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable	2022-11-26 15:42:44 +01:00
Moriz Wahl	aa1a88bc11	Merge branch 'master' into fix-wrong-balance	2022-11-25 14:44:39 +01:00
Moriz Wahl	62c48712a4	fix misspelled text	2022-11-25 14:32:12 +01:00
Wolfgang Huß	2d634b4111	Test 'sendResetPasswordEmail'	2022-11-24 22:10:07 +01:00
Wolfgang Huß	a652654be7	Refactor 'sendResetPasswordEmail' email to HTML and translatable	2022-11-24 22:09:36 +01:00
Wolfgang Huß	44f2e6b06a	Move 'getTimeDurationObject' and 'printTimeDuration' into a separate file	2022-11-24 20:15:55 +01:00
Wolfgang Huß	e07a2f88c1	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-24 16:23:10 +01:00
Wolfgang Huß	ae65af9df8	Test 'sendContributionRejectedEmail'	2022-11-24 16:10:41 +01:00
Wolfgang Huß	72213988ac	Refactor 'sendContributionRejectedEmail' email to HTML and translatable	2022-11-24 16:10:29 +01:00
Wolfgang Huß	727e5ca1f6	Test 'sendContributionConfirmedEmail'	2022-11-24 14:45:33 +01:00
Wolfgang Huß	c87ffd5b8a	Refactor 'sendContributionConfirmedEmail' email to HTML and translatable	2022-11-24 14:44:50 +01:00