1374 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	cc8cabef69	Merge branch 'master' into semaphore ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-12-13 10:05:20 +01:00
Ulf Gebhardt	a82e1877a8	Merge branch 'master' into log-client-timezone-offset	2022-12-09 14:14:23 +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
elweyn	ffb5988760	Refactoring of some small smelling code.	2022-12-06 11:58:17 +01:00
Ulf Gebhardt	7c528d5f9b	use semaphore to lock transactions	2022-12-06 11:25:37 +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
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	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
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
Moriz Wahl	77d93f18fa	remove test	2022-11-24 13:13:01 +01:00
Moriz Wahl	b3e880d45f	undo refactoring	2022-11-24 13:03:50 +01:00
joseji	2a74b92472	user saving on db	2022-11-24 11:21:47 +01:00
elweyn	b05c009d6e	Merge branch 'master' into 2285-mark-creation-via-link	2022-11-24 09:05:36 +01:00
Wolfgang Huß	98798d3322	Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts'	2022-11-22 17:24:36 +01:00
Wolfgang Huß	76fa425529	Refactor 'sendAddedContributionMessageEmail' email to HTML and translatable	2022-11-22 13:18:32 +01:00
joseji	e55f516c51	removed unused import	2022-11-22 11:19:42 +01:00
joseji	3aeb9dd0f1	fixes added	2022-11-22 11:12:18 +01:00
Wolfgang Huß	624cd6e4bc	Fix spelling of error message in 'sendActivationEmail'	2022-11-22 08:34:48 +01:00
Wolfgang Huß	18a4408e8a	Adjust the tests for new translatable 'sendAccountActivationEmail'	2022-11-21 13:37:29 +01:00
jjimenezgarcia	b5c6f185ac	Merge branch 'master' into new-password-encryption	2022-11-20 18:15:16 +01:00
joseji	fc23fc9e87	fixes done	2022-11-20 18:14:43 +01:00
Wolfgang Huß	ba1ec66707	Merge branch '1288-email-templates' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-17 14:10:49 +01:00
joseji	39d006351d	unused import added wrongly	2022-11-17 14:10:46 +01:00
Hannes Heine	878a538255	Merge branch 'master' into 2285-mark-creation-via-link	2022-11-17 14:05:16 +01:00
Wolfgang Huß	cd8c0b88ae	Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates ... # Conflicts: # backend/src/graphql/resolver/UserResolver.ts	2022-11-17 13:54:50 +01:00
Wolfgang Huß	369752783c	Translate and HTML'lize email 'sendAccountActivation'	2022-11-17 13:46:59 +01:00