2736 Commits

Author	SHA1	Message	Date
Wolfgang Huß	cd6a6df123	Implement sender name and amount in subject of email 'transactionReceived'	2022-12-20 15:36:47 +01:00
Wolfgang Huß	9b4c8fe610	Fix missing email parameters 'supportEmail', 'communityURL'	2022-12-20 15:03:52 +01:00
Wolfgang Huß	2f650ce172	Fix missing email imprint locale	2022-12-20 15:03:00 +01:00
Hannes Heine	6b2f5153d4	Merge branch 'master' into 2332-mark-contribution-as-rejected	2022-12-20 14:53:48 +01:00
Wolfgang Huß	9da21a5cfb	Replace greeting formular by include and add imprint by this	2022-12-20 14:06:25 +01:00
Wolfgang Huß	9314f8e427	Replace hello line in emails by include	2022-12-20 14:03:48 +01:00
Wolfgang Huß	70d080cf84	Remove 'span' tag from emails	2022-12-20 14:00:47 +01:00
Wolfgang Huß	dd760a650b	Add imprint to 'accountMultiRegistration'	2022-12-20 13:59:41 +01:00
elweyn	853bfabd57	Finish denie logic, add deniedAt IsNull() to queries.	2022-12-20 12:09:59 +01:00
Wolfgang Huß	b89870c813	Implement 'COMMUNITY_SUPPORT_MAIL' in backend ... - Increase backend 'CONFIG_VERSION'.	2022-12-20 11:49:00 +01:00
elweyn	dabef05dc0	Change name of user to moderatorUser.	2022-12-20 10:24:27 +01:00
mahula	72fe637ec3	fix merge conflict	2022-12-16 13:33:24 +01:00
mahula	881e38f22b	set email disabled and tls enabled as defaults in backend config	2022-12-16 13:05:57 +01:00
Claus-Peter Hübner	814bb996db	merge of PR-2465: setup unit tests for federation	2022-12-16 01:31:58 +01:00
Ulf Gebhardt	ba2ad05088	Merge branch 'semaphore' into test-semaphore	2022-12-15 23:08:31 +01:00
Ulf Gebhardt	5a925c0526	"fixed" semaphore tests	2022-12-15 23:08:19 +01:00
Ulf Gebhardt	f306dddfaf	console logs, fix order by id instead of date	2022-12-15 23:06:29 +01:00
Moriz Wahl	20fbaa276f	feat(backend): test semaphore	2022-12-15 18:35:11 +01:00
Moriz Wahl	78a780568a	feat(release): version 1.16.0	2022-12-15 17:07:35 +01:00
Moriz Wahl	d03a3f601c	mock semaphore to allow to use jest fake timers	2022-12-15 17:00:35 +01:00
Moriz Wahl	cb55da5d32	confirming two contributions at once does not throw anymore	2022-12-15 15:58:02 +01:00
Ulf Gebhardt	a8995914f3	Merge branch 'master' into seed-contributions ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.test.ts	2022-12-15 15:40:39 +01:00
Moriz Wahl	8bf95ad0ee	Merge pull request #2465 from gradido/setup-unit-tests-for-hyperswarm ... feat(backend): setup unit tests for federation	2022-12-15 14:46:14 +01:00
Ulf Gebhardt	9537910413	lock also on contributions	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	a98d569fb3	lock also on transactionLink	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	3d52875588	external semaphore transactions lock file	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	c2c7e34539	share the lock for transactions via external file. Do all possible checks before acquiring the lock	2022-12-15 13:07:53 +01:00
Moriz Wahl	1320c962ac	Merge branch 'clear-old-password-junk' of github.com:gradido/gradido into clear-old-password-junk	2022-12-15 13:04:48 +01:00
Moriz Wahl	ce0e306284	remove unused import	2022-12-15 13:03:23 +01:00
Moriz Wahl	873076ebfc	remove unused import	2022-12-15 13:02:19 +01:00
Moriz Wahl	88eeed7530	Merge branch 'master' into clear-old-password-junk	2022-12-15 12:56:34 +01:00
Ulf Gebhardt	f741986b2b	Merge branch 'master' into semaphore	2022-12-15 12:41:59 +01:00
Ulf Gebhardt	1f765bd3f4	fix find last Transaction	2022-12-15 12:41:42 +01:00
Ulf Gebhardt	ef6d697514	Merge branch 'master' into semaphore ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-12-15 12:02:07 +01:00
Ulf Gebhardt	8afd66088d	Merge branch 'master' into consistent-transaction-table	2022-12-15 11:27:31 +01:00
Ulf Gebhardt	00a7ac4eb5	deleted old comment	2022-12-15 11:18:31 +01:00
Ulf Gebhardt	59b40bf44d	Merge branch 'master' into clear-old-password-junk ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-15 11:17:45 +01:00
Claus-Peter Hübner	5cdffc1734	Merge remote-tracking branch 'origin/master' into ... 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-12-14 21:38:26 +01:00
Moriz Wahl	e7435fd4fe	feat(backend): setup unit tests federation	2022-12-14 17:23:20 +01:00
elweyn	10abf45e15	Merge dissolve_admin_resolver to local branch.	2022-12-14 11:04:16 +01:00
joseji	798051f360	docker error solved	2022-12-14 00:10:55 +01:00
Moriz Wahl	1229a7f7df	change database version	2022-12-13 22:14:06 +01:00
joseji	9b97b6c40e	removed text files regarding passphrase	2022-12-13 21:16:57 +01:00
Moriz Wahl	b52c62749c	include user contact in user context object	2022-12-13 21:07:12 +01:00
Moriz Wahl	35f9157f41	Merge branch 'master' into clear-old-password-junk	2022-12-13 20:52:06 +01:00
Moriz Wahl	1b31d09278	add tests for semaphore	2022-12-13 20:42:20 +01:00
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	02656ee117	fix tests after merge	2022-12-13 15:49:41 +01:00