2551 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
Moriz Wahl	04c88a743b	Merge branch 'master' into consistent-user-contacts-table	2022-12-12 13:50:40 +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	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
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
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	54c1786406	Merge branch 'master' into consistent-user-contacts-table	2022-12-01 16:21:53 +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
Moriz Wahl	7f1e69c1bd	update database version	2022-12-01 14:52:08 +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	272c7ee491	Merge branch 'master' into fix-negative-amount-on-send-coins	2022-11-30 18:04:26 +01:00
Ulf Gebhardt	37ffbd28b3	Merge branch 'master' into dissolve_admin_resolver	2022-11-30 17:19:02 +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	10ad42babe	missing files to be copied	2022-11-29 16:37:25 +01:00
Wolfgang Huß	317224db7a	Refactor some readme's by moving their content into 'CONTRIBUTING.md'	2022-11-29 14:09:15 +01:00
Wolfgang Huß	3d55c7da9e	Fix production by copying missing email templates and locale files into the build folder	2022-11-29 13:41:42 +01:00
Wolfgang Huß	88cae0e528	Move email '*.pug' templates in 'templates' folder	2022-11-29 13:40:08 +01:00
Wolfgang Huß	8afe0aaf3b	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-29 07:58:17 +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
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07:31 +01:00