11528 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	a82f0a2864	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-24 11:20:14 +01:00
elweyn	b05c009d6e	Merge branch 'master' into 2285-mark-creation-via-link	2022-11-24 09:05:36 +01:00
Ulf Gebhardt	6f8212fe54	test fix	2022-11-23 23:52:53 +01:00
Ulf Gebhardt	16e6b0f493	Merge branch 'master' into dissolve_admin_resolver	2022-11-23 23:45:01 +01:00
Ulf Gebhardt	7b2e6730bd	lint fixes	2022-11-23 23:44:43 +01:00
Ulf Gebhardt	ecb99bd603	separate Contribution- and TransactionLink Resolvers	2022-11-23 23:37:47 +01:00
Ulf Gebhardt	a2c1b0ff96	separate AdminResolver.test into the corresponding parts	2022-11-23 22:52:22 +01:00
Ulf Gebhardt	f4a9aa1a68	Merge branch 'master' into jest_is_dev_depenency	2022-11-23 18:06:20 +01:00
Ulf Gebhardt	29c4395452	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-23 17:57:56 +01:00
Ulf Gebhardt	a1e8d0b206	Update docu/Concepts/BusinessRequirements/Zeitzonen_Behandlung.md	2022-11-23 17:57:22 +01:00
mahula	66da74c77a	Merge pull request #2399 from gradido/2317-refactor-admin-statistics-on-its-own-page ... refactor(admin): statistics in a table and on separate page in admin area	2022-11-23 14:22:36 +01:00
joseji	60e3f62832	enum use on community user initialization	2022-11-23 11:32:27 +01:00
mahula	4dfd78ebd7	adapt unit test to test rendering of the data on admin area statistics page	2022-11-23 08:58:39 +01:00
Moriz Wahl	ea62a7f710	fix(backend): email verification code never expired	2022-11-22 18:01:36 +01:00
Wolfgang Huß	98798d3322	Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts'	2022-11-22 17:24:36 +01:00
Wolfgang Huß	a1ec8dfa4f	Remove old untranslated email 'sendAddedContributionMessageEmail'	2022-11-22 14:16:10 +01:00
Wolfgang Huß	fb01567169	Test 'sendAddedContributionMessageEmail' in 'sendEmailVariants.test.ts'	2022-11-22 14:13:01 +01:00
mahula	abe61f9c8c	adapt unit test for admin area routing	2022-11-22 13:41:09 +01:00
Wolfgang Huß	76fa425529	Refactor 'sendAddedContributionMessageEmail' email to HTML and translatable	2022-11-22 13:18:32 +01:00
mahula	8348d612b6	adapt unit test for admin area statistics page	2022-11-22 13:08:14 +01:00
Ulf Gebhardt	4554b01b89	order and correct imports of resolvers	2022-11-22 13:01:38 +01:00
Ulf Gebhardt	db1a11a2b5	seperate admin resolver into existing resolvers	2022-11-22 12:41:08 +01:00
Wolfgang Huß	53b29db25e	Add README's for locales – especially for quotation marks	2022-11-22 11:24:13 +01:00
joseji	e55f516c51	removed unused import	2022-11-22 11:19:42 +01:00
Wolfgang Huß	0695ac282b	Adjust the fixed 'CONFIG.EMAIL_TEST_MODUS' problem in 'sendEmailTranslated.ts'	2022-11-22 11:17:26 +01:00
joseji	3aeb9dd0f1	fixes added	2022-11-22 11:12:18 +01:00
mahula	7ef66e9da4	remove undefines elements from StatisticTable compoment	2022-11-22 09:17:23 +01:00
mahula	7c4e252757	fix typo in unit test	2022-11-22 09:01:55 +01:00
Wolfgang Huß	624cd6e4bc	Fix spelling of error message in 'sendActivationEmail'	2022-11-22 08:34:48 +01:00
Ulf Gebhardt	41891c1b57	Merge branch 'master' into jest_is_dev_depenency	2022-11-21 17:19:12 +01:00
Wolfgang Huß	b8fdb59d73	Remove old email 'sendAccountActivationEmail'	2022-11-21 13:38:18 +01:00
Wolfgang Huß	18a4408e8a	Adjust the tests for new translatable 'sendAccountActivationEmail'	2022-11-21 13:37:29 +01:00
Wolfgang Huß	b78229b646	Fix faulty email content tests	2022-11-21 12:22:25 +01:00
Wolfgang Huß	560aed056a	Fix spelling and punctuation in German email translations	2022-11-21 12:20:51 +01:00
jjimenezgarcia	b5c6f185ac	Merge branch 'master' into new-password-encryption	2022-11-20 18:15:16 +01:00
joseji	fc23fc9e87	fixes done	2022-11-20 18:14:43 +01:00
mahula	fa78db6d8b	use apollo object in community statistics page	2022-11-20 11:13:30 +01:00
clauspeterhuebner	a110da2d9c	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-18 00:42:06 +01:00
clauspeterhuebner	c1b91f9456	Update docu/Concepts/BusinessRequirements/Zeitzonen_Behandlung.md ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-18 00:41:50 +01:00
mahula	5abc930987	change locales details key to plural	2022-11-17 22:11:21 +01:00
mahula	992992ea2a	Merge branch 'master' into 2317-refactor-admin-statistics-on-its-own-page	2022-11-17 21:21:25 +01:00
mahula	0cf556542a	fix order in en.json	2022-11-17 21:20:08 +01:00
mahula	419dca99e8	adapt and write unit tests for statistics page in admin area	2022-11-17 19:23:03 +01:00
mahula	cc835dc960	linting	2022-11-17 19:12:49 +01:00
mahula	116dfa8aca	set auto width for statistics table and right align text in colunms	2022-11-17 18:48:37 +01:00
mahula	fa734edbbe	move statistics nav element to the right	2022-11-17 18:46:23 +01:00
Wolfgang Huß	0fdb3e4401	Test 'sendAccountActivationEmail'	2022-11-17 15:27:07 +01:00
Wolfgang Huß	aa97f08460	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-17 14:57:27 +01:00
Wolfgang Huß	effa070f84	Merge pull request #2163 from gradido/1288-email-templates ... feat(backend): 🍰 Email Templates	2022-11-17 14:40:39 +01:00
Wolfgang Huß	ba1ec66707	Merge branch '1288-email-templates' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-17 14:10:49 +01:00