10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	70780878f5	Merge branch 'master' into query-transaction-link	2022-03-10 01:49:12 +01:00
Ulf Gebhardt	2bf6e5a98a	python3	2022-03-09 21:28:03 +01:00
Ulf Gebhardt	9943dce7e7	node 17 with node-gyp dependencies	2022-03-09 21:25:17 +01:00
Ulf Gebhardt	9390cd7fd2	downgraded node version to 16.14 to have proper python compiler	2022-03-09 21:14:58 +01:00
Ulf Gebhardt	0275417f3d	updated node version frontend	2022-03-09 21:11:58 +01:00
Ulf Gebhardt	5c308e41b9	workflow for stylelint	2022-03-09 21:00:01 +01:00
Ulf Gebhardt	28f8c9e8ac	stylelint for scss	2022-03-09 20:58:12 +01:00
Ulf Gebhardt	eb681467de	no inline style	2022-03-09 20:30:26 +01:00
Alexander Friedland	85e39a47af	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 19:40:39 +01:00
Moriz Wahl	4784fc23ab	delete transaction link mutation	2022-03-09 19:30:31 +01:00
Moriz Wahl	b23cb8915c	set roles and rights	2022-03-09 19:06:15 +01:00
Moriz Wahl	dbc8382f33	Merge branch 'create-transaction-link-mutation' of github.com:gradido/gradido into create-transaction-link-mutation	2022-03-09 18:25:32 +01:00
Moriz Wahl	5f42748358	error message and constant for transaction link duration	2022-03-09 18:25:17 +01:00
Moriz Wahl	7edacb9c8f	Merge branch 'master' into create-transaction-link-mutation	2022-03-09 18:19:17 +01:00
Moriz Wahl	8107066d2b	balance includes transactions to hold available, calculateBalance checks for pending transaction links	2022-03-09 18:18:22 +01:00
elweyn	4ad5f60604	Call mutation in case where the prozess is put on send link.	2022-03-09 17:56:08 +01:00
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
Moriz Wahl	8211538d6f	Merge pull request #1584 from gradido/model-transaction-link ... feat: Model Transaction Link	2022-03-09 17:23:26 +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	96dcdf0170	add deletedAt to constructor	2022-03-09 17:09:57 +01:00
Moriz Wahl	dbb42c30ec	increase timeout by factoe 100	2022-03-09 17:07:32 +01:00
Moriz Wahl	916fae91b3	Merge branch 'model-transaction-link' into create-transaction-link-mutation	2022-03-09 17:00:35 +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	f961772854	add soft delete to transaction link model	2022-03-09 16:51:56 +01:00
Moriz Wahl	01648aaa0d	add soft delete for transaction links	2022-03-09 16:51:17 +01:00
Moriz Wahl	d4ce46b271	update db version	2022-03-09 16:34:54 +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
Hannes Heine	67eed2b0c8	Merge branch 'master' into query-transaction-link	2022-03-09 15:52:14 +01:00
Moriz Wahl	0bc070b784	Merge branch 'master' into model-transaction-link	2022-03-09 15:51:52 +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