126 Commits

Author SHA1 Message Date
ogerly
b1416c59e7 resolve conflict 2022-08-04 12:16:36 +02:00
Alexander Friedland
baa7f8df4a
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-04 11:02:45 +02:00
mahula
2d80c7029e including validation date infos to link copying after transaction link creation
- adapt transaction link creation mutation to get the validation date
- add validation date and text to link copy
- utilize mixins to avoid code doubling
2022-07-28 13:06:42 +02:00
ogerly
9ef150cc3a add mutation deleteContribution, add apollo deleteContribution 2022-07-20 14:25:20 +02:00
ogerly
a87c5f70ee add contributionDate for contribution list 2022-07-20 12:01:45 +02:00
ogerly
f3390b7de1 add updateContribution updateContributionForm 2022-07-18 18:10:29 +02:00
ogerly
70a8f9b0ca change query to get contributionCount and contributionList 2022-07-18 18:10:29 +02:00
ogerly
ffe8831d09 change listContributions query add confirmedBy and confirmedAt 2022-07-13 11:28:35 +02:00
ogerly
b0df5996e0 change computed lastMonthObject 2022-07-13 11:06:29 +02:00
ogerly
72d912dbdb add creation on login query and store 2022-07-13 09:03:09 +02:00
ogerly
4cc1642988 add mutations createContribution 2022-07-08 21:26:18 +02:00
Moriz Wahl
845e3d3e61 get QueryLinkResult working 2022-06-16 15:11:13 +02:00
ogerly
ef881d94cd load contribution link and transaction link 2022-06-16 14:34:30 +02:00
ogerly
eb7f8290af add Page Community, add query listContributionLinks 2022-06-08 22:15:59 +02:00
ogerly
32f8e43c90 remove files and code from coinanimation settings 2022-05-29 12:08:28 +02:00
c6a4650866
remove code from trasnsactionLinkList query, adjusted test to have full URL in apollo mock 2022-04-21 13:34:47 +02:00
febe57ce13
remove code from graphql query, just use code 2022-04-21 13:28:21 +02:00
19f2686b6e
Merge branch 'master' into 1637-generate-link-backend
# Conflicts:
#	frontend/src/components/ClipboardCopy.vue
#	frontend/src/components/GddSend/TransactionResultLink.vue
#	frontend/src/components/TransactionLinks/TransactionLink.vue
#	frontend/src/components/Transactions/TransactionLinkSummary.spec.js
2022-04-21 13:14:52 +02:00
Moriz Wahl
fd509bd216
Merge branch 'master' into frontend_community_info_bake_in 2022-04-20 13:48:01 +02:00
Moriz Wahl
997ef9d72a query only required fields on balance 2022-04-12 21:34:04 +02:00
751387ee3d
removed frontend community mixin & community query 2022-04-07 12:55:32 +02:00
elweyn
41b35f2c5e Add link to the TransactionLink and change code by link in frontend. 2022-04-06 18:45:27 +02:00
d5d90c7050
remove decayStartBlock from all component interfaces 2022-04-06 15:24:17 +02:00
Moriz Wahl
a0eb707375 change name of mutation which was wrongly called as query 2022-03-30 18:21:52 +02:00
Moriz Wahl
03da5aa343 change transaction list query to new balance object 2022-03-29 01:29:08 +02:00
ogerly
62831a71df add transactionLinkId on query 2022-03-25 21:46:38 +01:00
Moriz Wahl
0ed539b098
Merge branch 'master' into linked-user-email 2022-03-23 20:16:49 +01:00
Moriz Wahl
67ea4e61f8 query linked user email in transaction 2022-03-21 20:31:12 +01:00
ogerly
2ea7cf6705 merge #1588 and resolve conflicts 2022-03-21 14:57:43 +01:00
Alexander Friedland
8bbe9401b0
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 13:08:48 +01:00
c83959fc58
Merge branch 'master' into 1319-email-optin 2022-03-21 12:30:57 +01:00
ogerly
15e0186381 add redeemCode on register process for createUser 2022-03-21 10:54:56 +01:00
Moriz Wahl
e9357198c0 change parameter name to code 2022-03-20 18:58:20 +01:00
ogerly
980d3ee527 change parameter id to code 2022-03-20 11:26:22 +01:00
Moriz Wahl
7f6b7482b0 Int as arg type for ID 2022-03-19 12:35:34 +01:00
Alexander Friedland
ffb5ff73ce
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-18 19:54:35 +01:00
Moriz Wahl
303ab94ba3
Merge branch 'master' into user-entity-in-context 2022-03-18 15:13:11 +01:00
Moriz Wahl
8040da7a66
Merge branch 'master' into seed-transaction-links 2022-03-18 15:01:42 +01:00
ogerly
37d7c9bf53 add show textbox for deleted link and redeemed link 2022-03-18 11:19:18 +01:00
ogerly
e1f67df794 add redeem modal and start function redeemLink() 2022-03-18 11:19:18 +01:00
ogerly
6be14e83b7 add no redeem - You can't redeem your own link! 2022-03-18 11:19:18 +01:00
ogerly
5dc1d1e67c add id to query queryTransactionLink, add locales for redeem amount, check auth 2022-03-18 11:19:18 +01:00
Moriz Wahl
577ca00c46 refactor transaction list query, do not allow user id an only creations as args any more. this query only return the transactions of the logged in user 2022-03-17 10:46:29 +01:00
Moriz Wahl
1182b94075 createUser returns User object, adopt mutations, reduce db calls in seed 2022-03-17 08:40:02 +01:00
ogerly
90ce74a98c add variables pageSize 2022-03-16 12:09:26 +01:00
Hannes Heine
e5217640e5
Merge branch 'master' into 1319-email-optin 2022-03-16 05:11:12 +01:00
ogerly
601f74c58c add mutation deleteTransactionLink in frontend/src/graphql/queries.js 2022-03-15 15:50:51 +01:00
ogerly
a67c66baf5 add id in listTransactionLinks in frontend/src/graphql/queries.js 2022-03-15 15:48:37 +01:00
ogerly
17ba78cc01 add query: listTransactionLinks 2022-03-15 11:37:10 +01:00
Hannes Heine
507b9975a3
Merge branch 'master' into 1319-email-optin 2022-03-15 08:28:17 +01:00