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

292 Commits

Author SHA1 Message Date
elweyn
d062a10a34 Fix linting. 2022-06-27 13:37:03 +02:00
elweyn
b95a8081fc Refactored getUserCreation & isContributionValid method to own files. 2022-06-24 12:17:28 +02:00
Wolfgang Huß
0b464591a1 Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-20 11:36:41 +02:00
Wolfgang Huß
f6f487aa7e Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 
# Conflicts:
#	backend/src/auth/RIGHTS.ts
 2022-06-16 14:23:35 +02:00
Moriz Wahl
232beb8bd9 quick and dirty confirm contribution link 2022-06-16 11:59:38 +02:00
Moriz Wahl
1de8c94ba3 rename updatePendingCreation 2022-06-15 20:01:53 +02:00
Moriz Wahl
2b87cbcd18 rename confirmPendingCreation 2022-06-15 19:33:40 +02:00
Moriz Wahl
dd04f69ecc rename deletePendingCreation 2022-06-15 19:22:01 +02:00
Moriz Wahl
d95b1893cd rename getPendingCreations 2022-06-15 19:13:19 +02:00
Moriz Wahl
244cf20542 further renaming 2022-06-15 19:02:47 +02:00
Moriz Wahl
3eddb226d8 save transaction id on confirmed contribution 2022-06-15 16:57:51 +02:00
Moriz Wahl
6623849337 Merge branch 'master' into contributions-table 2022-06-15 16:50:50 +02:00
Moriz Wahl
cf8ecb4c10 update rights 2022-06-15 15:11:05 +02:00
Moriz Wahl
eabd14bdf3 further renaming 2022-06-15 09:04:34 +02:00
Moriz Wahl
e60f06bb9b rename mutations to create admin contributions 2022-06-15 08:32:30 +02:00
Moriz Wahl
5845f708f6 rename from pending creation to unconfirmed contribution 2022-06-14 19:47:18 +02:00
Moriz Wahl
92b076e8b1 Merge branch 'master' into contributions-table 2022-06-14 19:12:43 +02:00
Moriz Wahl
dc46f4e78c add update contribution link mutation 2022-06-14 15:29:34 +02:00
Moriz Wahl
fa30b871b7 delete contribution link mutation 2022-06-14 13:12:41 +02:00
Moriz Wahl
fd2f6a16b7 lsit contribution links query 2022-06-14 12:10:16 +02:00
Moriz Wahl
f258f63ee7 test createContributionLink 2022-06-14 10:43:03 +02:00
Moriz Wahl
1e0b246252 simple createContributionLink mutation 2022-06-14 09:44:37 +02:00
Moriz Wahl
bd593e96ae roles and args for contribution links 2022-06-14 09:23:51 +02:00
Wolfgang Huß
4b7a643275 Implement 'setUserRole' resolver and write tests (still with errors) 2022-06-09 16:23:01 +02:00
Wolfgang Huß
f71bf5da30 Add 'isAdmin' property to 'UserAdmin' and 'AdminResolver', 'searchUsers' 2022-06-08 10:48:03 +02:00
Moriz Wahl
d048a00143 getPendingCreations excludes confirmed contributions 2022-06-02 08:43:30 +02:00
Moriz Wahl
2c67d5f5fe filter args optional, now default values 2022-06-01 14:11:50 +02:00
Wolfgang Huß
06b5aaaa1c
Update backend/src/graphql/resolver/AdminResolver.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-01 10:05:02 +02:00
Wolfgang Huß
517034dcab
Update backend/src/graphql/resolver/AdminResolver.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-01 10:02:38 +02:00
Wolfgang Huß
d6556cd02c
Update backend/src/graphql/resolver/AdminResolver.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-01 10:01:20 +02:00
Wolfgang Huß
514a38ea38 Make transaction link filter object nullable 2022-05-31 11:00:56 +02:00
Moriz Wahl
e44a41b22b contribution to transaction as transaction 2022-05-31 08:12:41 +02:00
Moriz Wahl
56ba42babd do not read confirmed and deleted contributions 2022-05-30 21:00:56 +02:00
Moriz Wahl
5d8bf7f27c add logger to admin resolver, log some tracing, fix seeds 2022-05-30 14:50:58 +02:00
Moriz Wahl
69a3cc0264 use new Contribution Data Model 2022-05-30 14:15:34 +02:00
Wolfgang Huß
cba20e8490 Rename TransactionLinkFilters fields from by* back to with* 2022-05-24 10:15:18 +02:00
Wolfgang Huß
311aa023e4 Test listTransactionLinksAdmin resolver, a start 2022-05-23 12:45:31 +02:00
Wolfgang Huß
85eaa4b391 Refactor to use filters in query listTransactionLinksAdmin 2022-05-23 11:23:56 +02:00
Wolfgang Huß
0c9f59d371 Merge branch '1840-refactor-to-filter-object' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 
# Conflicts:
#	admin/src/pages/Creation.spec.js
#	admin/src/pages/Creation.vue
#	backend/src/graphql/resolver/AdminResolver.test.ts
#	backend/src/graphql/resolver/AdminResolver.ts
 2022-05-19 18:29:44 +02:00
Wolfgang Huß
879ff45dfd Use if statement for 'filters' object may be null 2022-05-19 17:41:16 +02:00
Wolfgang Huß
a9a3f5b55a Rename filters properties 2022-05-19 17:09:40 +02:00
Wolfgang Huß
3ba19359a3 Make filters object nullable and writing resolver tests 2022-05-19 10:46:32 +02:00
Wolfgang Huß
0f8ffb5860 Refactor to have filters GQL object and input for usererSearch, a start 2022-05-18 14:46:19 +02:00
Wolfgang Huß
946280a6db Rename transaction link filters 
– Fix spelling in comment.
 2022-05-16 12:00:57 +02:00
Moriz Wahl
9c00e5b592 test that second creation throws when not waiting for first to be completed 2022-05-09 18:35:27 +02:00
Moriz Wahl
201e952c08 throw when creation cannot be confirmed 2022-05-09 14:29:02 +02:00
Moriz Wahl
bd6e5a2679
Merge branch 'master' into test-admin-resolver 2022-04-28 16:14:07 +02:00
Moriz Wahl
48826feaa6 improve error messages 2022-04-28 11:53:24 +02:00
Wolfgang Huß
778c9568e6 Resolved Ulf's error detection 2022-04-28 10:48:50 +02:00
Moriz Wahl
76b1763bc0 test deletePendingCreation and confirmPendingCreation mutations 2022-04-27 17:52:00 +02:00