1159 Commits

Author SHA1 Message Date
Moriz Wahl
40aa617bcc
Merge branch 'master' into remove-showEmail 2022-03-10 18:26:35 +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
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
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
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
f961772854 add soft delete to transaction link model 2022-03-09 16:51:56 +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
Moriz Wahl
0bc070b784
Merge branch 'master' into model-transaction-link 2022-03-09 15:51:52 +01:00
Moriz Wahl
6d6f58a932 save hold available amount 2022-03-09 15:43: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
8bdd25cd01 add hold available amount to model 2022-03-09 15:09:01 +01:00
Moriz Wahl
dee6fd9d0a fix createdAt is now 2022-03-09 14:59:21 +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
eb5b19e6d6 add code column to model and entity 2022-03-09 12:02:10 +01:00
Moriz Wahl
437da5eeda feat: Transaction Link Model 2022-03-09 11:05:01 +01:00
Moriz Wahl
a385f1772c fix test 2022-03-08 18:19:01 +01:00
Moriz Wahl
18318404eb Merge branch 'master' into test-login-user-resolver 2022-03-08 18:06:16 +01:00
Moriz Wahl
c5ff18f461 use @paths 2022-03-08 18:04:55 +01:00
Moriz Wahl
982be8d1ac
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 14:06:52 +01:00
Moriz Wahl
82ebcc0ae9
Merge branch 'master' into test-login-user-resolver 2022-03-08 14:06:21 +01:00
Moriz Wahl
75a1feb7ee no relative paths in tests 2022-03-07 22:03:54 +01:00
Moriz Wahl
9879c4550e path to models 2022-03-07 21:58:30 +01:00
Moriz Wahl
7e4c3ec3ce more resolved paths 2022-03-07 21:56:03 +01:00
Moriz Wahl
b361f12325 resolve relative paths in directives 2022-03-07 21:44:29 +01:00
Moriz Wahl
f0e7cc2a50 resolve relative paths in arg 2022-03-07 21:42:57 +01:00
Moriz Wahl
8b57327d22 remove empty files, resolve relative paths in model 2022-03-07 21:40:41 +01:00
Moriz Wahl
0136a22f0c resolve relative paths in resolvers 2022-03-07 21:35:50 +01:00
Moriz Wahl
e44bc316bf refactor: Resolve Relative Paths in Backend 2022-03-07 21:35:23 +01:00
Moriz Wahl
33fc918429 change route for reset password email 2022-03-07 19:22:15 +01:00
Alexander Friedland
187deba1a8
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 16:38:37 +01:00
31721337ba
Merge branch 'master' into adminarea-creation-transactionlist-show 2022-03-07 16:24:29 +01:00
Alexander Friedland
5847f723c6
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 16:18:45 +01:00
c8977ea749
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:09:24 +01:00
Alexander Friedland
651bb725d9
Merge branch 'master' into adminarea-creation-transactionlist-show 2022-03-07 16:09:09 +01:00
Hannes Heine
fb2945df71
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:01:59 +01:00
5cae087a26
Merge branch 'master' into fix_send_to_use_without_transactions 2022-03-07 16:00:27 +01:00
Alexander Friedland
30269d060c
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 15:54:01 +01:00