11447 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	d02b9ab52d	fix test for Settings.vue	2022-11-26 10:48:06 +01:00
Alexander Friedland	5cd847507f	Merge branch 'master' into 2290-New-Design	2022-11-26 10:47:10 +01:00
ogerly	5716f67100	fix locales	2022-11-26 10:37:28 +01:00
ogerly	4551e4b561	fix lint	2022-11-26 10:37:08 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +01:00
Moriz Wahl	9556e196ab	Merge pull request #2423 from gradido/fix-balance-migration ... fix(database): wrong balance and decay values	2022-11-25 18:22:06 +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
mahula	06fd7c9b9a	disable submit button of contribution messages formular until submit request is finished in wallet	2022-11-25 17:41:04 +01:00
mahula	84613af035	disable submit button of contribution messages formular until submit request is finished	2022-11-25 17:38:25 +01:00
ogerly	9be6927603	all unused code outcommend	2022-11-25 16:37:59 +01:00
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
ogerly	ce74e83b57	fix locales and stylelint	2022-11-25 13:19:47 +01:00
ogerly	a89f809315	resolve conflicts	2022-11-25 13:17:17 +01:00
ogerly	fa2ca76554	review from ulf	2022-11-25 12:02:05 +01:00
Alexander Friedland	ebefe46b03	Update frontend/src/assets/scss/gradido-template-dark.scss ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-25 10:39:28 +01:00
ogerly	c4e671256a	step 1 from new style done	2022-11-25 10:37:08 +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
ogerly	5f3b19c595	contributionList style	2022-11-24 12:06:24 +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