6875 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	d99dc6d20a	Mutation to call generateLink written in frontend.	2022-03-09 17:53:56 +01:00
elweyn	c38c5c3243	Merge backend querie, mutation and database in frontend send coins.	2022-03-09 17:53:16 +01:00
elweyn	665c30aa60	Change the Send page so we send another mutation when the user sends a link than send gdds.	2022-03-09 17:38:00 +01:00
elweyn	c7bda9b15e	Merge branch 'Elweyn/issue1558' into frontend-generate-link-for-send-gdd	2022-03-09 17:35:14 +01:00
elweyn	fe5909e649	Merge remote-tracking branch 'origin/frontend-generate-link-for-send-gdd' into Elweyn/issue1558	2022-03-09 17:17:06 +01:00
elweyn	d91310c7de	WIP Implement the frontend to show the transactionLinkInformation.	2022-03-09 17:16:26 +01:00
elweyn	281be67ceb	Add query to getTransactionInformation to the queries of the frontend.	2022-03-09 17:15:42 +01:00
elweyn	3c9b5ea63c	Create query to getTransactionLinkInformation.	2022-03-09 17:15:04 +01:00
Moriz Wahl	bd49fe688d	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 16:57:04 +01:00
Moriz Wahl	f4f63a9519	take pending transaction links into acount when testing for available balance	2022-03-09 16:26:23 +01:00
elweyn	6ce7a59956	Merge branch 'query-transaction-link' into Elweyn/issue1558	2022-03-09 16:23:08 +01:00
Moriz Wahl	a84a1f0d4b	Merge pull request #1538 from gradido/test-login-user-resolver ... feat: Test Login in User Resolver	2022-03-09 15:51:38 +01:00
Moriz Wahl	d7d232f2f4	Merge branch 'master' into test-login-user-resolver	2022-03-09 15:44:06 +01:00
Moriz Wahl	6d6f58a932	save hold available amount	2022-03-09 15:43:13 +01:00
ogerly	28fea1942d	test setChecked in TransactionForm, test for TransactionConfirmation	2022-03-09 15:42:41 +01:00
ogerly	441333209c	removed selected value gift, change gift to link	2022-03-09 15:42:41 +01:00
elweyn	a0e241e6b0	Created Query that search for an TransactionLink with a given code	2022-03-09 15:16:13 +01:00
Moriz Wahl	0f3d2719d5	Merge branch 'model-transaction-link' into create-transaction-link-mutation	2022-03-09 15:15:05 +01:00
Moriz Wahl	55e50b10c7	reduce length of code in migration	2022-03-09 15:14:15 +01:00
Moriz Wahl	54dee861dd	reduce length of code	2022-03-09 15:12:25 +01:00
Moriz Wahl	8bdd25cd01	add hold available amount to model	2022-03-09 15:09:01 +01:00
Moriz Wahl	14a0a4344d	Add hold_available_amount column	2022-03-09 15:07:55 +01:00
Moriz Wahl	f78f2d5977	remove default dates	2022-03-09 15:01:34 +01:00
Moriz Wahl	91c7b05185	remove default dates	2022-03-09 15:00:34 +01:00
Moriz Wahl	dee6fd9d0a	fix createdAt is now	2022-03-09 14:59:21 +01:00
Alexander Friedland	eaf8c57e37	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 14:52:07 +01:00
Moriz Wahl	9550c31cac	set type for redeemed by, change order	2022-03-09 14:34:29 +01:00
Moriz Wahl	ea38251c0e	Merge branch 'master' into model-transaction-link	2022-03-09 14:30:53 +01:00
Moriz Wahl	1a715f8b71	simple resolver for createTransactionLink	2022-03-09 14:30:25 +01:00
Moriz Wahl	e88f561003	rights for createTransactionLink	2022-03-09 14:29:57 +01:00
Moriz Wahl	c9d24c3b61	add constructor	2022-03-09 14:29:20 +01:00
Moriz Wahl	e8e86d6351	set DB version	2022-03-09 14:28:28 +01:00
Moriz Wahl	75b91a2db3	set type for redeemed by, change order	2022-03-09 14:27:53 +01:00
Alexander Friedland	8110068d58	Merge pull request #1583 from gradido/1581-No-Pointer-Cursor-on-Transaction-List ... add style in App.vue, set class .pointer on transaction-list-item	2022-03-09 12:56:42 +01:00
Moriz Wahl	eb5b19e6d6	add code column to model and entity	2022-03-09 12:02:10 +01:00
Moriz Wahl	19084d7514	entity transaction link	2022-03-09 11:55:36 +01:00
ogerly	3dc82f780e	set bg-color on collaps	2022-03-09 11:51:23 +01:00
ogerly	67506c0ed6	add style in App.vue, set class .pointer on transaction-list-item	2022-03-09 11:44:50 +01:00
Moriz Wahl	5f5bde2f0f	migration to create transaction_links table	2022-03-09 11:38:24 +01:00
Alexander Friedland	dde510679e	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 11:30:33 +01:00
ogerly	ddaa1634a0	change i18n locales to en, change test date contain without text	2022-03-09 11:29:06 +01:00
Moriz Wahl	5fb81a629c	less divs	2022-03-09 11:22:15 +01:00
Moriz Wahl	a4c2ff3309	remove unnecesesary divs	2022-03-09 11:22:15 +01:00
Moriz Wahl	e4f2a2e055	refactor display of time passed for decay	2022-03-09 11:22:15 +01:00
Moriz Wahl	ef6567843c	map transaction typeId to locales	2022-03-09 11:22:15 +01:00
Moriz Wahl	fe10316d47	block for tests	2022-03-09 11:22:15 +01:00
Moriz Wahl	94e26ced63	add tests for amount filters	2022-03-09 11:22:15 +01:00
Moriz Wahl	18a17aca7a	render decay with GDD	2022-03-09 11:22:15 +01:00
Moriz Wahl	c219a35783	do not use amount filter in status component	2022-03-09 11:22:15 +01:00
ogerly	1bcabd26e8	remove substring in tests, merge master	2022-03-09 11:21:11 +01:00