6929 Commits

Author SHA1 Message Date
Alexander Friedland
1f4c987194
Merge branch 'master' into frontend-generate-link-for-send-gdd 2022-03-11 11:58:05 +01:00
Moriz Wahl
6badb058cb
Merge pull request #1602 from gradido/remove-showEmail
refactor: Remove showEmail from Transaction Links
2022-03-11 11:33:35 +01:00
Moriz Wahl
7f9745c7a4
Merge branch 'master' into remove-showEmail 2022-03-11 11:22:32 +01:00
Moriz Wahl
f7b6aabfc9
Merge pull request #1597 from gradido/delete-transaction-link-mutation
feat: Delete Transaction Link Mutation
2022-03-11 11:22:09 +01:00
Moriz Wahl
5300f5db12
Merge branch 'master' into remove-showEmail 2022-03-11 11:15:33 +01:00
Moriz Wahl
50092b0f15 Merge branch 'master' into delete-transaction-link-mutation 2022-03-11 11:14:23 +01:00
Alexander Friedland
bc4450dc8f
Merge branch 'master' into frontend-generate-link-for-send-gdd 2022-03-11 11:09:53 +01:00
Hannes Heine
797d270b73
Merge pull request #1586 from gradido/query-transaction-link
Query-transaction-link
2022-03-11 00:03:14 +01:00
elweyn
7e3f86f60e Remove unused import. 2022-03-10 23:49:28 +01:00
elweyn
bfba633b78 Change the logic to store the redeemer in transactionLink table. 2022-03-10 21:52:49 +01:00
elweyn
a805f65920 Change the logic to a better argument name for redeemUserId. 2022-03-10 21:37:23 +01:00
elweyn
280de3df9e Add Args for the queryTransactionLink. 2022-03-10 21:36:53 +01:00
elweyn
ade691426e Add logic for user that redeem the link. 2022-03-10 21:24:42 +01:00
Moriz Wahl
55455d0236 remove showEmail form model, args and resolver 2022-03-10 18:31:15 +01:00
Moriz Wahl
681f27d4b0 update entity as in master 2022-03-10 18:28:42 +01:00
Moriz Wahl
40aa617bcc
Merge branch 'master' into remove-showEmail 2022-03-10 18:26:35 +01:00
Moriz Wahl
cb4e6da317 deleteTransactionLink mutation returns boolean, no more to does 2022-03-10 18:25:54 +01:00
elweyn
701f0549b8 Merge branch 'query-transaction-link' of https://github.com/gradido/gradido into query-transaction-link 2022-03-10 18:15:47 +01:00
Hannes Heine
92f02f9f39
Merge branch 'master' into query-transaction-link 2022-03-10 18:14:27 +01:00
Moriz Wahl
ff9dde8870
Merge branch 'master' into delete-transaction-link-mutation 2022-03-10 18:10:33 +01:00
elweyn
def310fa3b Add QUERY_TRANSACTION_LINK to inalienable rights. 2022-03-10 18:10:03 +01:00
Moriz Wahl
cd0287e030
Merge pull request #1585 from gradido/create-transaction-link-mutation
feat: Create Transaction Link Mutation
2022-03-10 18:09:54 +01:00
Moriz Wahl
47e491db84 update entity 2022-03-10 18:01:13 +01:00
Moriz Wahl
80650e60b8 remove apollo log plugin hack, improve model 2022-03-10 18:00:47 +01:00
Moriz Wahl
91ffc16ed0 remove showEmail from transaction link model, alter database version 2022-03-10 17:35:15 +01:00
Moriz Wahl
95c786f484 migration to remove showEmail 2022-03-10 17:33:01 +01:00
Moriz Wahl
fae9d91004 add comment to explain why set to null in constructor 2022-03-10 16:00:15 +01:00
Moriz Wahl
3436253bbe transaction link repository, use raw query to get sum of hold available amount 2022-03-10 15:33:26 +01:00
Moriz Wahl
9143990535 turn of logger when NODE_ENV === '"development"' 2022-03-10 15:05:32 +01:00
Moriz Wahl
91fe38fe8f use db values instead of null 2022-03-10 14:28:42 +01:00
elweyn
443b95b978 Mere changes with wip 2022-03-10 13:01:24 +01:00
elweyn
f1726675b7 Use method to call informations. 2022-03-10 12:59:08 +01:00
ogerly
d24830bdb2 yarn locales --fix 2022-03-10 10:51:44 +01:00
ogerly
f4b5961c38 yarn lint --fix 2022-03-10 10:51:24 +01:00
ogerly
cec79d462f add locales for transaction-link, add default datas for ShowTransactionLinkInformations 2022-03-10 10:50:01 +01:00
ogerly
b97837d415 test data for displaySetup in ShowTransactionLinkInformations.vue 2022-03-10 10:34:48 +01:00
Hannes Heine
70780878f5
Merge branch 'master' into query-transaction-link 2022-03-10 01:49:12 +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