11528 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	c59a5a3d30	Merge branch 'master' into semaphore	2022-12-13 20:31:36 +01:00
Moriz Wahl	7470a80818	Merge branch 'master' into consistent-transaction-table	2022-12-13 20:31:13 +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	6e766fa76c	Merge pull request #2418 from gradido/test-validation-of-optin-codes ... fix(backend): email verification code never expired	2022-12-13 16:17:03 +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
Ulf Gebhardt	f2dadcd93d	Merge branch 'master' into consistent-transaction-table	2022-12-13 10:13:34 +01:00
Ulf Gebhardt	cc8cabef69	Merge branch 'master' into semaphore ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-12-13 10:05:20 +01:00
Hannes Heine	4be546c68e	Merge branch 'master' into dissolve_admin_resolver	2022-12-13 09:01:44 +01:00
Moriz Wahl	907cd03ab8	Merge pull request #2451 from gradido/consistent-user-contacts-table ... fix(database): consistent deleted at bewteen users and user contacts	2022-12-12 14:58:51 +01:00
Moriz Wahl	04c88a743b	Merge branch 'master' into consistent-user-contacts-table	2022-12-12 13:50:40 +01:00
Moriz Wahl	82d92d9223	Merge branch 'consistent-user-contacts-table' into consistent-transaction-table	2022-12-12 12:46:46 +01:00
Moriz Wahl	61899579aa	Merge pull request #2454 from gradido/log-client-timezone-offset ... feat(backend): log client timezone offset	2022-12-12 12:45:47 +01:00
Moriz Wahl	c449e41cfb	update only by SQL, thanks @ulfgebhardt	2022-12-12 12:45:17 +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
Wolfgang Huß	70a3b1bc7e	Merge pull request #2398 from gradido/2392-refactor-more-emails-to-translatables ... refactor(backend): refactor more emails to translatables	2022-12-09 13:12:55 +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	effa58d767	Merge pull request #2444 from gradido/fix-delete-email-contact ... fix(backend): delete / undelete email contact as well	2022-12-08 19:47:29 +01:00
Moriz Wahl	61ecfa22fd	Merge branch 'master' into log-client-timezone-offset	2022-12-08 19:13:26 +01:00
Moriz Wahl	c8fa84ac11	Merge branch 'master' into consistent-user-contacts-table	2022-12-08 19:12:49 +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
joseji	9604a6309a	found more and more junk everywhere, almost cleared	2022-12-06 22:31:15 +01:00
Hannes Heine	4794ca61c1	Merge pull request #2363 from gradido/2285-mark-creation-via-link ... feat(backend): 🍰 Mark creation via link	2022-12-06 12:34:41 +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	7c528d5f9b	use semaphore to lock transactions	2022-12-06 11:25:37 +01:00
Ulf Gebhardt	bf2e7fb79d	await semaphore package	2022-12-06 11:24:51 +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
elweyn	3ba591637c	Remove unused method.	2022-12-02 07:32:08 +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	caa16c0488	insert correct email id	2022-12-01 17:36:17 +01:00
Moriz Wahl	fed61bf888	kack typescript	2022-12-01 17:16:56 +01:00
Moriz Wahl	251f87554c	kack typescript	2022-12-01 17:14:44 +01:00
Moriz Wahl	345123af11	add user contact for missing users	2022-12-01 17:10:35 +01:00
Moriz Wahl	ed3a76dfdc	update database version	2022-12-01 16:56:24 +01:00
Moriz Wahl	c5f4e95847	fix(database): create missing users for transactions	2022-12-01 16:54:48 +01:00
Moriz Wahl	54c1786406	Merge branch 'master' into consistent-user-contacts-table	2022-12-01 16:21:53 +01:00
Moriz Wahl	e458a7dd8d	Merge pull request #2452 from gradido/fix-jest-run-all-timeers ... fix(backend): run all timers for high values	2022-12-01 16:21:37 +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