2570 Commits

Author	SHA1	Message	Date
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
joseji	7fe7b98dfe	removing non necessary functions	2022-11-29 13:10:33 +01:00
joseji	81f6066754	removed unused code	2022-11-29 13:06:17 +01:00
joseji	7e78f1c893	migration fixed	2022-11-29 13:03:10 +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
joseji	e350307e6a	removing keys and passphrases	2022-11-28 23:59:57 +01:00
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07: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ß	4ae96a2213	Translate 'Gradido (nicht antworten)'	2022-11-28 11:13:04 +01:00
Wolfgang Huß	3b47330c92	Remove remainders of old untranslated emails	2022-11-28 11:05:12 +01:00
Wolfgang Huß	93e3562318	Remove old untranslated email 'sendTransactionReceivedEmail'	2022-11-28 11:04:34 +01:00
Wolfgang Huß	9894b02f51	Test 'sendTransactionReceivedEmail'	2022-11-28 10:54:31 +01:00
Wolfgang Huß	3903e29e16	Refactor 'sendTransactionReceivedEmail' email to HTML and translatable	2022-11-28 10:54:10 +01:00
Wolfgang Huß	0cccdb56de	Test that 'sendEmailTranslated' on 'CONFIG.EMAIL_TEST_MODUS = true' replaces the receiver with by the fake test mail accaount	2022-11-28 09:38:19 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Wolfgang Huß	2b65c6b261	Remove old untranslated email 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:45:41 +01:00
Wolfgang Huß	699daa8eec	Test 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:43:44 +01:00
Wolfgang Huß	224613f6d4	Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable	2022-11-26 15:42:44 +01:00
Wolfgang Huß	4b097f6f66	Add line ends to all 'subject.pug' files	2022-11-26 12:59:06 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +01:00
Ulf Gebhardt	48365c7bb3	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-25 17:53:48 +01:00
Ulf Gebhardt	2c3cac5939	Merge branch 'master' into fix-balance-migration	2022-11-25 17:48:28 +01:00
Moriz Wahl	aa1a88bc11	Merge branch 'master' into fix-wrong-balance	2022-11-25 14:44:39 +01:00
Moriz Wahl	9253706513	remove comment	2022-11-25 14:32:23 +01:00
Moriz Wahl	62c48712a4	fix misspelled text	2022-11-25 14:32:12 +01:00
Claus-Peter Hübner	89283fa3da	rework PR comments	2022-11-25 04:08:01 +01:00
Claus-Peter Hübner	9395b5a0ba	resolve conflicts	2022-11-25 03:11:14 +01:00
Claus-Peter Hübner	efa46f50f3	resolve conflicts	2022-11-25 03:09:54 +01:00
Claus-Peter Hübner	7543acfb53	Merge branch '2367-feature-add-federation-configs' of ... github.com:gradido/gradido into 2367-feature-add-federation-configs	2022-11-25 03:06:52 +01:00
Claus-Peter Hübner	7a2de6c437	rework PR comments	2022-11-25 03:03:57 +01:00
Claus-Peter Hübner	111602c707	rework PR comments	2022-11-25 03:03:17 +01:00
Claus-Peter Hübner	d021cb2918	renamend porperties to FEDERATION_xxx	2022-11-25 03:01:23 +01:00
clauspeterhuebner	192ab67817	Update backend/src/index.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-25 01:43:59 +01:00
clauspeterhuebner	ce1b488865	Update backend/.env.template ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-25 01:37:56 +01:00
clauspeterhuebner	68586eaae7	Update backend/.env.dist ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-25 01:37:36 +01:00
Claus-Peter Hübner	5863736658	create DHT-KeyPair with optional configured Seed	2022-11-25 01:01:14 +01:00
Claus-Peter Hübner	28fa11bcd5	use the new config property to start DHT	2022-11-25 00:59:35 +01:00
Claus-Peter Hübner	cf1c68f290	define the federation config properties	2022-11-25 00:58:28 +01:00