11380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	bd49a1e80d	Merge pull request #2422 from gradido/fix-wrong-balance ... fix(backend): wrong balance after transaction receive	2022-11-25 15:19:31 +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
Ulf Gebhardt	bc0cbfe2f7	lint fix	2022-11-25 14:24:47 +01:00
Ulf Gebhardt	1ea8eb1815	create log folder	2022-11-25 14:23:47 +01:00
Ulf Gebhardt	0f71a486a5	log affected accounts & some fixes	2022-11-25 14:13:22 +01:00
Claus-Peter Hübner	89283fa3da	rework PR comments	2022-11-25 04:08:01 +01:00
Ulf Gebhardt	4bb82f2933	Merge branch 'master' into jest_is_dev_depenency	2022-11-25 03:42:17 +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
Claus-Peter Hübner	b4fbb09f26	define the federation config properties	2022-11-25 00:57:48 +01:00
Claus-Peter Hübner	7d56905b62	Merge remote-tracking branch 'origin/master' into 2367-feature-add-federation-configs	2022-11-24 23:35:20 +01:00
clauspeterhuebner	bfccd815d3	Merge pull request #2301 from gradido/2267-feature-gradido-roadmap ... feat(other): feature gradido roadmap	2022-11-24 21:56:42 +01:00
clauspeterhuebner	1314ed5263	Merge branch 'master' into 2267-feature-gradido-roadmap	2022-11-24 21:22:45 +01:00
Moriz Wahl	f2e8846932	rename migration file, set new db version in backend	2022-11-24 16:37:32 +01:00
Moriz Wahl	63e22eeab8	fix(database): wrong balance and decay values	2022-11-24 16:30:55 +01:00
Ulf Gebhardt	bd28a888a6	Merge branch 'master' into jest_is_dev_depenency	2022-11-24 13:40:59 +01:00
Moriz Wahl	77d93f18fa	remove test	2022-11-24 13:13:01 +01:00
Moriz Wahl	b3e880d45f	undo refactoring	2022-11-24 13:03:50 +01:00
jjimenezgarcia	8b9eb4a522	Merge pull request #2353 from gradido/new-password-encryption ... refactor(backend): new password encryption implementation	2022-11-24 12:00:20 +01:00
jjimenezgarcia	d8f5cda0fc	Merge branch 'master' into new-password-encryption	2022-11-24 11:26:02 +01:00
joseji	2a74b92472	user saving on db	2022-11-24 11:21:47 +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
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
Ulf Gebhardt	41891c1b57	Merge branch 'master' into jest_is_dev_depenency	2022-11-21 17:19:12 +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