IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,854 Commits 1 Branch 0 Tags
Commit Graph

6854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
8211538d6f
Merge pull request #1584 from gradido/model-transaction-link 
feat: Model Transaction Link
 2022-03-09 17:23:26 +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
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
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
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
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
Moriz Wahl
437da5eeda feat: Transaction Link Model 2022-03-09 11:05:01 +01:00
Moriz Wahl
7ddfeed97d
Merge pull request #1576 from gradido/use-filter-to-display-amounts 
feat: Use Vue Filter to Display Gradido Amounts
 2022-03-09 10:50:46 +01:00
Moriz Wahl
a385f1772c fix test 2022-03-08 18:19:01 +01:00
Moriz Wahl
25288ce835
Merge branch 'master' into use-filter-to-display-amounts 2022-03-08 18:06:42 +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
8300449324
Merge pull request #1572 from gradido/refactor-backend-relative-paths 
refactor: Resolve Relative Paths in Backend
 2022-03-08 18:01:21 +01:00