11447 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	842864d0dc	new community style prepared	2022-11-24 04:51:40 +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
mahula	abe61f9c8c	adapt unit test for admin area routing	2022-11-22 13:41:09 +01:00
ogerly	f8e1514bb2	style transactions list, style plugins	2022-11-22 13:20:41 +01:00
mahula	8348d612b6	adapt unit test for admin area statistics page	2022-11-22 13:08:14 +01:00
joseji	e55f516c51	removed unused import	2022-11-22 11:19:42 +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
ogerly	e9ba63d0ec	style shadow, backgrounds	2022-11-21 17:19:38 +01:00
Ulf Gebhardt	41891c1b57	Merge branch 'master' into jest_is_dev_depenency	2022-11-21 17:19:12 +01:00
ogerly	f3d8e496d6	app center, max width 1320px	2022-11-21 15:26:27 +01:00
ogerly	5ea426506c	repared profil	2022-11-21 13:35:28 +01:00
ogerly	63ee06f347	Structure of the community prepared	2022-11-21 05:28:53 +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
ogerly	41e532b26d	communty button for tab navigation	2022-11-20 12:45:37 +01:00
ogerly	734826a8b5	Commmunity page, new tabsystem with hashes	2022-11-20 12:37:33 +01:00
mahula	fa78db6d8b	use apollo object in community statistics page	2022-11-20 11:13:30 +01:00
ogerly	3a5de83f67	remove unused code	2022-11-20 08:17:13 +01:00
ogerly	acd1c8bf8e	right-side and content-header areas prepared	2022-11-20 08:09:19 +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
ogerly	82544930e3	ContentHeader && RideSide Structur	2022-11-17 18:17:05 +01:00
ogerly	a44f9583c2	skeleton struktur, bg-image svg	2022-11-17 18:17:05 +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
joseji	39d006351d	unused import added wrongly	2022-11-17 14:10:46 +01:00
Wolfgang Huß	f3c6316a92	Merge branch '1288-email-templates' of github.com:gradido/gradido into 1288-email-templates	2022-11-17 13:55:21 +01:00
Wolfgang Huß	cd8c0b88ae	Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates ... # Conflicts: # backend/src/graphql/resolver/UserResolver.ts	2022-11-17 13:54:50 +01:00
Wolfgang Huß	c5469df997	Give 'html' tag the language of the email receiver	2022-11-17 13:50:01 +01:00
Wolfgang Huß	038d7a6a5f	Refine and cleanup documentation	2022-11-17 13:49:18 +01:00
jjimenezgarcia	bc6fb2f71a	Merge branch 'master' into new-password-encryption	2022-11-17 13:38:49 +01:00
joseji	47d8469eb3	new password implementation set up and test	2022-11-17 13:38:16 +01:00
Moriz Wahl	7373a02796	Merge pull request #2393 from gradido/fix-timezone-problems ... fix(backend): timezone problems	2022-11-17 10:59:41 +01:00
Moriz Wahl	36185a286a	move clear all mocks to correct position	2022-11-16 14:42:45 +01:00
Moriz Wahl	eac290919d	avoid reverse, restore removed clear mocks	2022-11-16 14:38:38 +01:00
Moriz Wahl	103790cccf	use jest.fn() for void function, correct timezone offset	2022-11-16 14:24:17 +01:00
jjimenezgarcia	13df737c09	Merge branch 'master' into new-password-encryption	2022-11-15 20:32:32 +01:00