943 Commits

Author SHA1 Message Date
elweyn
d062a10a34 Fix linting. 2022-06-27 13:37:03 +02:00
elweyn
2d90fdd64e New Resolver for Contribution, createContribution method. 2022-06-24 12:19:02 +02:00
elweyn
b95a8081fc Refactored getUserCreation & isContributionValid method to own files. 2022-06-24 12:17:28 +02:00
Wolfgang Huß
4c420ecbf4
Merge branch 'master' into 1880-no-throw-when-register-with-existing-email 2022-06-21 11:11:56 +02:00
Wolfgang Huß
91959aea28 Fulfill Moriz suggestions 2022-06-20 16:08:35 +02:00
Wolfgang Huß
50f5667288 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-06-20 13:56:25 +02:00
Wolfgang Huß
a0a9eda0b4 Merge branch '1881-set-role-in-admin-interface' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-20 12:15:26 +02:00
Wolfgang Huß
00a224f0ce
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:12:01 +02:00
Wolfgang Huß
036a966693
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:49 +02:00
Wolfgang Huß
d9becacb4c
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:38 +02:00
Wolfgang Huß
f1a23fe9b7
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:30 +02:00
Wolfgang Huß
638e58c84e
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:10:08 +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
ogerly
6ecc10318d remove double whitespace 2022-06-17 09:42:35 +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
9ca1ee3455 fix validation rules for redeem contribution link 2022-06-16 12:39:07 +02:00
Moriz Wahl
232beb8bd9 quick and dirty confirm contribution link 2022-06-16 11:59:38 +02:00
Moriz Wahl
06b5c7606c query for transaction link may find a contribution link 2022-06-16 10:57:38 +02:00
Moriz Wahl
409e44f679 store contribution link id on user when regsitered with contribution link code 2022-06-16 10:44:17 +02:00
Moriz Wahl
d3824ae642 Merge branch 'master' into 1881-set-role-in-admin-interface 2022-06-16 07:35:06 +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
5b7cb5cdf4 test CL-prefix on contribution links 2022-06-15 16:08:16 +02:00
Moriz Wahl
64a7f4aa6f remove CL-prefix for contribution links in tests 2022-06-15 16:04:14 +02:00
Moriz Wahl
ad3bb58d43 createContributionLink response contains contribution id 2022-06-15 15:19:29 +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
7640680c42 seed two ContributionLinks 2022-06-14 18:04:20 +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
8ba0a4af7c no only in admin resolver tests 2022-06-14 12:11:43 +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
Wolfgang Huß
09d99a72f4 Add todo comment 2022-06-14 10:41:57 +02:00
Wolfgang Huß
c5f7673cf2 Change following the review suggestions of Alex and Moriz 2022-06-14 10:35:34 +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ß
8dc1202305 Fix 'setUserRole' resolver tests 2022-06-09 16:43:40 +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
Wolfgang Huß
9b90f52cba Cleanup 2022-06-02 16:00:09 +02:00
Wolfgang Huß
7ec96f9084 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 2022-06-02 15:56:39 +02:00