11373 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	61ecfa22fd	Merge branch 'master' into log-client-timezone-offset	2022-12-08 19:13:26 +01:00
Hannes Heine	4794ca61c1	Merge pull request #2363 from gradido/2285-mark-creation-via-link ... feat(backend): 🍰 Mark creation via link	2022-12-06 12:34:41 +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	d3678bb81c	feat(backend): log client timezone offset	2022-12-01 17:44:56 +01:00
Moriz Wahl	e458a7dd8d	Merge pull request #2452 from gradido/fix-jest-run-all-timeers ... fix(backend): run all timers for high values	2022-12-01 16:21:37 +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
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	a91158a963	Merge pull request #2443 from gradido/fix-negative-amount-on-send-coins ... fix(backend): critical bug	2022-11-30 20:40:59 +01:00
Moriz Wahl	272c7ee491	Merge branch 'master' into fix-negative-amount-on-send-coins	2022-11-30 18:04:26 +01:00
Ulf Gebhardt	bed31ab3ec	Merge pull request #2442 from gradido/fix_docker_production_build ... fix(other): missing files for docker production build	2022-11-30 17:18:29 +01:00
Moriz Wahl	c0096aa26c	fix(backend): critical bug	2022-11-30 12:15:47 +01:00
Ulf Gebhardt	2db6329a46	Merge branch 'master' into fix_docker_production_build	2022-11-29 23:45:54 +01:00
Ulf Gebhardt	10ad42babe	missing files to be copied	2022-11-29 16:37:25 +01:00
mahula	e00fe51017	Merge pull request #2424 from gradido/2342-bug-moderators-can-send-messages-twice-by-clicking-fast ... fix(frontend): in contribution messages formular a message can be send twice, when clicking the submit button fast	2022-11-29 11:36:41 +01:00
mahula	b662f957b4	Merge branch 'master' into 2342-bug-moderators-can-send-messages-twice-by-clicking-fast	2022-11-29 11:06:19 +01:00
mahula	403e68480c	change variable name to our standard naming	2022-11-29 11:05:26 +01:00
clauspeterhuebner	4c3847e68f	Merge pull request #2201 from gradido/2179-bug-wrong-month-for-contribution-near-turn-of-month ... fix(backend): wrong month for contribution near turn of month	2022-11-29 01:33:58 +01:00
clauspeterhuebner	1e4d922c88	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-29 01:06:14 +01:00
clauspeterhuebner	f2380c6dfa	Merge pull request #2374 from gradido/2367-feature-add-federation-configs ... feat(backend): add federation config properties	2022-11-28 22:56:35 +01:00
clauspeterhuebner	0d9b759bea	Update deployment/bare_metal/.env.dist ... set federation diabled as default Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-28 15:09:00 +01:00
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07:31 +01:00
Ulf Gebhardt	7bc99a86dc	Merge pull request #2385 from gradido/jest_is_dev_depenency ... fix(backend): moved all jest & type-definition related packages into the `devDependencies` section	2022-11-27 00:18:55 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Moriz Wahl	45d58fe6e5	Merge pull request #2425 from gradido/v1.15.0 ... chore(release): v1.15.0	2022-11-26 13:16:36 +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
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