2583 Commits

Author	SHA1	Message	Date
Wolfgang Huß	a60bbc2047	Update backend/src/locales/de.json ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-12-22 13:54:27 +01:00
Wolfgang Huß	254e0410f5	Fix tests for emails	2022-12-22 11:22:39 +01:00
Wolfgang Huß	aa19a4a3b4	Add imprint logo to emails ... - Remove big space under 'Hello XXX' line.	2022-12-22 11:11:51 +01:00
Wolfgang Huß	a30b2b0752	Change German sentence spelling and Gradido plural in email subject	2022-12-20 16:18:20 +01:00
Wolfgang Huß	53a4d469d9	Remove text part 'by entering your email address' from two emails	2022-12-20 15:41:08 +01:00
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
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
Wolfgang Huß	b89870c813	Implement 'COMMUNITY_SUPPORT_MAIL' in backend ... - Increase backend 'CONFIG_VERSION'.	2022-12-20 11:49:00 +01:00
Moriz Wahl	78a780568a	feat(release): version 1.16.0	2022-12-15 17:07:35 +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	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
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	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
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
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
Moriz Wahl	82d92d9223	Merge branch 'consistent-user-contacts-table' into consistent-transaction-table	2022-12-12 12:46:46 +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
joseji	9604a6309a	found more and more junk everywhere, almost cleared	2022-12-06 22:31:15 +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