7512 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	1680a15b8a	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-23 20:16:25 +01:00
Alexander Friedland	1f3a3835b1	Merge pull request #1647 from gradido/1559-frontend-transport-redeem-link-through-register ... 1559 frontend transport redeem link through register	2022-03-23 20:13:33 +01:00
Ulf Gebhardt	9cda1c5bb2	Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register	2022-03-23 20:00:54 +01:00
Ulf Gebhardt	c0c6630873	make redeemCode nullable	2022-03-23 19:59:29 +01:00
Moriz Wahl	ff8c71cf7f	Merge pull request #1655 from gradido/1636-Generating-link-does-not-update-gdd-balance ... update-balance if link succesfully generated	2022-03-23 19:55:38 +01:00
Moriz Wahl	65fb882f63	Update backend/src/webhook/elopage.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 19:40:36 +01:00
Moriz Wahl	807922a8d5	redeem code in email link config	2022-03-23 09:17:15 +01:00
Moriz Wahl	767387bb7c	change {code} to {optin} to avoid confusion when redeem code is provided	2022-03-23 09:05:39 +01:00
Moriz Wahl	042e05dc75	Update frontend/src/pages/Send.spec.js ... Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>	2022-03-23 08:53:30 +01:00
Moriz Wahl	9c1ad7405a	Update frontend/src/pages/Send.spec.js ... Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>	2022-03-23 08:53:19 +01:00
Moriz Wahl	1e39767525	Merge branch '1555-Admin-see-user-generated-link' of github.com:gradido/gradido into 1555-Admin-see-user-generated-link	2022-03-23 08:20:55 +01:00
Moriz Wahl	d1770ccb1a	default values for filters	2022-03-23 08:20:37 +01:00
ogerly	245f447b99	rename file from LinksTransactionListFormular to TransactionLinkList	2022-03-23 08:02:50 +01:00
ogerly	4692802d6f	show no table if items 0	2022-03-23 07:53:58 +01:00
Moriz Wahl	d0b2a28ae2	add simple filter for list transaction link admin query	2022-03-23 07:43:16 +01:00
Moriz Wahl	3575d2d2aa	sort locales	2022-03-23 06:47:10 +01:00
Alexander Friedland	ad73d1f6d3	Update admin/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-22 20:17:41 +01:00
Alexander Friedland	34944d6b25	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-22 20:17:29 +01:00
Moriz Wahl	1c8e1df1b5	100% test of Reset Password, better naming of variables	2022-03-22 20:11:34 +01:00
Moriz Wahl	9b53458655	fix test	2022-03-22 19:38:51 +01:00
Moriz Wahl	9c8599528e	allow null for redeemCode	2022-03-22 19:24:58 +01:00
Moriz Wahl	296749d207	shorthand	2022-03-22 19:06:55 +01:00
Moriz Wahl	752228a7ea	query transaction links as admin	2022-03-22 19:06:22 +01:00
Moriz Wahl	ab0f7c8c7e	add listTransactionLinksAdmin query	2022-03-22 18:51:41 +01:00
Moriz Wahl	31e07e70ce	reset transaction data after success from server	2022-03-22 18:33:16 +01:00
Moriz Wahl	421ae60507	reset transaction formular emits set transaction with empty data	2022-03-22 18:25:58 +01:00
Moriz Wahl	9097a45cff	restructure and improve tests	2022-03-22 18:17:51 +01:00
Moriz Wahl	8c8d06d87c	bind the transaction data to the transaction form to allow data restoration after canceling transaction confirmation, use always update transaction to update balance	2022-03-22 17:56:34 +01:00
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
Alexander Friedland	b5af2dd842	Merge branch 'master' into 1555-Admin-see-user-generated-link	2022-03-22 14:56:49 +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
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
ogerly	af7105191e	show table with transaction links from user	2022-03-22 11:10:44 +01:00
ogerly	942d4d2d3a	rename from getListTransactionLinks to listTransactionLinks	2022-03-22 11:10:04 +01:00
Hannes Heine	2457371300	Merge branch 'master' into add-referrer-id-to-users	2022-03-22 09:50:09 +01:00
ogerly	b5a5c21744	add component LinksTransactionListFormular	2022-03-22 09:32:15 +01:00
ogerly	5ab0295051	add graphql query listTransactionLinks	2022-03-22 09:31:23 +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
ogerly	4675c56790	test router.test.js fixed	2022-03-21 21:38:28 +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