2474 Commits

Author	SHA1	Message	Date
Moriz Wahl	c8fa84ac11	Merge branch 'master' into consistent-user-contacts-table	2022-12-08 19:12:49 +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
elweyn	3ba591637c	Remove unused method.	2022-12-02 07:32:08 +01:00
Moriz Wahl	2caa0ad4c9	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 18:46:24 +01:00
Moriz Wahl	54c1786406	Merge branch 'master' into consistent-user-contacts-table	2022-12-01 16:21:53 +01:00
Moriz Wahl	41495c2c65	fix(backend): run all timers for high values	2022-12-01 15:53:09 +01:00
elweyn	0b2887b86f	Correct joins between contribution and transaction	2022-12-01 15:21:49 +01:00
Moriz Wahl	7f1e69c1bd	update database version	2022-12-01 14:52:08 +01:00
elweyn	ec396e8521	Merge master.	2022-12-01 12:45:15 +01:00
elweyn	96fd4cb14c	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 12:07:52 +01:00
elweyn	46014adc6d	Database join contribution to transaction table, add new join to query.	2022-12-01 12:07:25 +01:00
Moriz Wahl	272c7ee491	Merge branch 'master' into fix-negative-amount-on-send-coins	2022-11-30 18:04:26 +01:00
Moriz Wahl	c0096aa26c	fix(backend): critical bug	2022-11-30 12:15:47 +01:00
Ulf Gebhardt	10ad42babe	missing files to be copied	2022-11-29 16:37:25 +01:00
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07:31 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +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
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
Claus-Peter Hübner	89283fa3da	rework PR comments	2022-11-25 04:08:01 +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
Moriz Wahl	f2e8846932	rename migration file, set new db version in backend	2022-11-24 16:37:32 +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
joseji	2a74b92472	user saving on db	2022-11-24 11:21:47 +01:00
elweyn	b05c009d6e	Merge branch 'master' into 2285-mark-creation-via-link	2022-11-24 09:05:36 +01:00
joseji	60e3f62832	enum use on community user initialization	2022-11-23 11:32:27 +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
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