7559 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	e08e1b7ea8	remove update balance method and event. We want to have the data always from the backend and do no calculation in the frontend	2022-03-22 17:54:55 +01:00
Moriz Wahl	0a3f80ddc9	add default properties to restore data when transaction is canceled in confirmation step	2022-03-22 17:53:51 +01:00
Moriz Wahl	31dcf30c46	load provide from dashboard layout, test set tunneled email	2022-03-22 14:59:24 +01:00
Alexander Friedland	61bc5efb11	Merge branch 'master' into 1636-Generating-link-does-not-update-gdd-balance	2022-03-22 14:54:10 +01:00
Moriz Wahl	78aaf629d2	add listener to transaction creation	2022-03-22 14:38:31 +01:00
Moriz Wahl	1c35793245	Merge branch 'master' into linked-user-email	2022-03-22 14:14:02 +01:00
Moriz Wahl	aaa6137c31	do not use route query to pass email. try inject/provide instead	2022-03-22 14:02:28 +01:00
Ulf Gebhardt	5e41b59fe7	fix deprecation warning: use slice instead of substr	2022-03-22 13:18:10 +01:00
Ulf Gebhardt	31c6f77a78	include constants in the config values	2022-03-22 13:14:26 +01:00
Ulf Gebhardt	1d6dace9f4	implement admin config checking	2022-03-22 13:14:13 +01:00
Ulf Gebhardt	703217e938	enforce config in frontend	2022-03-22 13:07:01 +01:00
Alexander Friedland	eda69bfc47	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-22 12:34:17 +01:00
Alexander Friedland	7929b93964	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-22 12:33:10 +01:00
Alexander Friedland	fe869e12c4	Update backend/src/graphql/resolver/UserResolver.test.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-22 12:31:44 +01:00
Ulf Gebhardt	2a5db25c43	Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register	2022-03-22 12:21:51 +01:00
Moriz Wahl	9a040bb84d	Merge pull request #1654 from gradido/add-referrer-id-to-users ... feat: Add Referrer ID to Users	2022-03-22 12:21:29 +01:00
Hannes Heine	2457371300	Merge branch 'master' into add-referrer-id-to-users	2022-03-22 09:50:09 +01:00
ogerly	36b4c6cce7	update-balance if link succesfully generated	2022-03-22 09:01:09 +01:00
ogerly	8a2ca07b2e	test UserResolver.test.js ok, with redeemCode	2022-03-22 07:09:58 +01:00
Moriz Wahl	ce8efa8dff	add mock	2022-03-21 21:47:06 +01:00
Moriz Wahl	b2d8760f21	catch email from route query	2022-03-21 21:44:22 +01:00
Moriz Wahl	4621ee35d1	use router push to navigate to send	2022-03-21 21:43:23 +01:00
ogerly	4675c56790	test router.test.js fixed	2022-03-21 21:38:28 +01:00
Moriz Wahl	f0132593b8	test link to send with param email	2022-03-21 21:09:00 +01:00
Moriz Wahl	ec354eafad	remove error handler	2022-03-21 20:52:04 +01:00
Moriz Wahl	c38b126635	linked user email as param to /send	2022-03-21 20:48:18 +01:00
Moriz Wahl	67ea4e61f8	query linked user email in transaction	2022-03-21 20:31:12 +01:00
Moriz Wahl	3057203d7c	Merge branch '1559-frontend-transport-redeem-link-through-register' of github.com:gradido/gradido into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:29:28 +01:00
Moriz Wahl	98fd9d287a	Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:29:14 +01:00
Moriz Wahl	5eccddec05	test that referrerId is present	2022-03-21 17:28:48 +01:00
Alexander Friedland	32d8cf4a9d	Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:25:41 +01:00
Alexander Friedland	5d8fed9c31	Merge pull request #1625 from gradido/1588-frontend-show-link-information ... 1558 - show tranaction link information page	2022-03-21 17:24:32 +01:00
Moriz Wahl	2b7d9d8c1a	save referrer ID when present on register	2022-03-21 17:23:56 +01:00
Moriz Wahl	3fe6206763	Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:16:00 +01:00
Moriz Wahl	8c802a9bee	add referrerId to entity model of User	2022-03-21 17:08:56 +01:00
Moriz Wahl	88cd631bca	update database version	2022-03-21 17:04:45 +01:00
Moriz Wahl	f49610aef4	add referrer id migration	2022-03-21 17:03:20 +01:00
Moriz Wahl	eaa621cc3a	coverage unit tests forntend tp 95%	2022-03-21 16:39:13 +01:00
Moriz Wahl	be8e3f489e	test with param code	2022-03-21 16:37:44 +01:00
Moriz Wahl	5baa14b359	test transaction link page	2022-03-21 16:25:17 +01:00
ogerly	2ea7cf6705	merge #1588 and resolve conflicts	2022-03-21 14:57:43 +01:00
Moriz Wahl	c57b40adc1	test Register with Redeem Code	2022-03-21 14:56:37 +01:00
Moriz Wahl	44f8155755	Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information	2022-03-21 14:54:53 +01:00
ogerly	ea99db0159	yarn lint and locales fixed	2022-03-21 14:50:50 +01:00
ogerly	9377102f00	deleted v-else	2022-03-21 14:46:14 +01:00
ogerly	f8882fa63a	remove computed	2022-03-21 14:41:50 +01:00
Moriz Wahl	8bfe350026	Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information	2022-03-21 14:39:49 +01:00
ogerly	7850127ae2	after login go to redeem page	2022-03-21 14:38:19 +01:00
Alexander Friedland	1baf855265	Merge branch 'master' into 1588-frontend-show-link-information	2022-03-21 14:37:04 +01:00
Moriz Wahl	efe8d0c63b	Merge pull request #1624 from gradido/no-float-ids ... refactor: No Float Ids	2022-03-21 14:32:50 +01:00