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
9,934 Commits 1 Branch 0 Tags
Commit Graph

9934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
85e36a9cae test Info Page 2022-08-17 16:21:14 +02:00
Moriz Wahl
35cb3176e3 display amounts in GDD 2022-08-17 15:59:19 +02:00
Moriz Wahl
9efe29c068 improve translation 2022-08-17 15:53:49 +02:00
Moriz Wahl
169523f8f1 test item info in sidebar as well 2022-08-17 15:47:58 +02:00
Moriz Wahl
d64895bcef improve test message texts 2022-08-17 15:42:08 +02:00
Moriz Wahl
61dfb1f881 Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 15:32:39 +02:00
Moriz Wahl
e5f7bec965
Merge pull request #2041 from gradido/statistics-resolver 
feat: Statistics Resolver
 2022-08-17 15:31:09 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Moriz Wahl
d058b7033b
Merge pull request #2127 from gradido/2116-retrieve-admin-and-moderators 
2116 retrieve admin and moderators
 2022-08-17 15:20:28 +02:00
Moriz Wahl
194d4a6ad2 move right COMMUNITY_STATISTICS to user rights 2022-08-17 15:15:35 +02:00
elweyn
3977f1cb38 Test for searchAdminUsers. 2022-08-17 14:10:54 +02:00
elweyn
e49689af77 Start tests for searchAdminUsers. 2022-08-17 14:10:54 +02:00
elweyn
c703117e60 Add searchAdminUsers query to mocks. 2022-08-17 14:10:54 +02:00
ogerly
924bbe52c3 Merge branch 'statistics-resolver' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 13:55:18 +02:00
elweyn
b1a17c52ec Add community_statistics to user ROLES. 2022-08-17 12:46:29 +02:00
Alexander Friedland
632141ffca
Merge branch 'master' into statistics-resolver 2022-08-17 12:44:31 +02:00
elweyn
1c301d34a2 Test for searchAdminUsers. 2022-08-17 11:37:13 +02:00
ogerly
a9b7ca67a7 fix test for sidebar 2022-08-17 11:09:59 +02:00
ogerly
ead9f5be7d fix test for router and navbar 2022-08-17 11:05:40 +02:00
ogerly
0be22fcc27 fix test 2022-08-17 10:51:36 +02:00
ogerly
212ad3aae9 add query searchAdminUsers 2022-08-17 10:51:36 +02:00
elweyn
c48ce63a14 Remove unused code. 2022-08-17 10:51:36 +02:00
elweyn
c6e08dd72d Fix changes. 2022-08-17 10:51:36 +02:00
elweyn
6c707eae59 Start tests for searchAdminUsers. 2022-08-17 10:22:08 +02:00
elweyn
f96fb5aa63 Add searchAdminUsers query to mocks. 2022-08-17 10:21:40 +02:00
Alexander Friedland
f21b5f49ab
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 10:17:04 +02:00
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
elweyn
beb563ac5c Fix changes. 2022-08-17 10:05:56 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
clauspeterhuebner
1e0922e311
Merge pull request #2126 from gradido/2125-feature-gradido-id-new-column-gradidoid-in-users-table 
2125 feature gradido id: new column gradidoid in users table
 2022-08-17 04:17:42 +02:00
Claus-Peter Hübner
72e1de9f78 Merge remote-tracking branch 'origin/master' into 
2125-feature-gradido-id-new-column-gradidoid-in-users-table
 2022-08-16 17:10:15 +02:00
Claus-Peter Hübner
e876f32ad5 initialize gradidoID of fakedUser per uuidv4() instead of constant 2022-08-16 17:05:31 +02:00
Alexander Friedland
3500b6125d
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-16 12:14:12 +02:00
Alexander Friedland
8b3ebb807b
Merge pull request #2120 from gradido/2119-New-menu-item-GDT 
2119 new menu item gdt
 2022-08-16 11:46:58 +02:00
Alexander Friedland
f3d6960721
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-16 11:37:17 +02:00
Alexander Friedland
722b0e4757
Update frontend/src/components/GddSend/TransactionConfirmationLink.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-16 11:37:10 +02:00
Alexander Friedland
9a1b73ebf3
Update frontend/src/components/GddSend/TransactionConfirmationLink.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-16 11:37:03 +02:00
Moriz Wahl
ca48218d33
Merge pull request #2136 from gradido/update-contributions-table 
feat: Migrate Contributions Table
 2022-08-16 11:22:12 +02:00
Wolfgang Huß
68031d5401
Merge branch 'master' into update-contributions-table 2022-08-16 11:08:31 +02:00
Wolfgang Huß
bc9db6b37b
Merge pull request #2092 from gradido/2091-refactor-contribution-form-logic-and-write-tests 
chore: 🍰 Refactor Contribution Form Logic And Write Tests
 2022-08-16 11:02:00 +02:00
ogerly
1ce2aec998 Merge branch '2116-retrieve-admin-and-moderators' into 1973-List-open-contribution-links-in-the-wallet 2022-08-16 09:58:00 +02:00
ogerly
3f30252cf5 fix test, fix lint 2022-08-16 09:55:19 +02:00
ogerly
13478960bc fix lint 2022-08-16 09:50:47 +02:00
ogerly
32e3252155 test for TransactionConfirmationLink 2022-08-16 09:34:16 +02:00
ogerly
90fb72a648 fix lint 2022-08-16 09:10:23 +02:00
Wolfgang Huß
7e912be184
Merge branch 'master' into 2091-refactor-contribution-form-logic-and-write-tests 2022-08-16 08:48:10 +02:00
Moriz Wahl
f2f8989746 save contribution when setting status DELETED before softDelete 2022-08-15 19:06:59 +02:00
Moriz Wahl
c417bc7a10 add contribution status enum and set it 2022-08-15 19:02:06 +02:00
Moriz Wahl
daa8d48ca6 add contribution type enum and set contribution type on creation 2022-08-15 18:50:25 +02:00
Moriz Wahl
cc2cc93b60 update db entity for contributions 2022-08-15 18:38:50 +02:00