836 Commits

Author SHA1 Message Date
Moriz Wahl
bd6e5a2679
Merge branch 'master' into test-admin-resolver 2022-04-28 16:14:07 +02:00
Moriz Wahl
eec79000c9 linting 2022-04-28 11:59:52 +02:00
Moriz Wahl
48826feaa6 improve error messages 2022-04-28 11:53:24 +02:00
Moriz Wahl
6251ad54d2
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:22:11 +02:00
Moriz Wahl
77ae24d54d
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:20:44 +02:00
Moriz Wahl
51f8dfb89f
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:19:51 +02:00
Moriz Wahl
4c6660a7a5
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:19:34 +02:00
Moriz Wahl
f448daf834
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:18:59 +02:00
Moriz Wahl
549aa1c3aa
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-28 11:18:50 +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
Moriz Wahl
e4776fcfd5 test get pending creations query 2022-04-27 14:08:56 +02:00
Moriz Wahl
4bf2871ba1 test update pending creation mutation 2022-04-27 13:38:40 +02:00
Moriz Wahl
a0e29e2524 remove moderator from update pending creation mutation args 2022-04-27 12:06:01 +02:00
Moriz Wahl
2e82f007e6 test createPendingCreations 2022-04-27 11:53:50 +02:00
Moriz Wahl
64454b6fa2 remove moderator from create pending creation mutation args, use context instead to get moderator ID 2022-04-27 11:11:30 +02:00
Moriz Wahl
ad8de559aa test unDelete User mutation 2022-04-27 10:11:14 +02:00
Moriz Wahl
06639d53d9 test delete user mutation 2022-04-27 09:57:39 +02:00
Wolfgang Huß
ee18ae41b9 Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted 2022-04-27 09:24:20 +02:00
Moriz Wahl
2ca291684c
Delete AdminResolver.test.ts 2022-04-26 13:26:59 +02:00
Moriz Wahl
6810c7b50d remove comment 2022-04-26 13:24:25 +02:00
Moriz Wahl
bef2badd89 debug seeed on stage1 2022-04-26 12:58:31 +02:00
Moriz Wahl
6d48b6f4e3 fix: Confirm Creation with Decimal 2022-04-26 09:27:55 +02:00
Moriz Wahl
294433ec7e
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:20:19 +02:00
Moriz Wahl
54e119f88d fix test after alter is admin field 2022-04-25 16:20:00 +02:00
Moriz Wahl
b3449a28af Merge branch 'more-user-resolver-tests' of github.com:gradido/gradido into more-user-resolver-tests 2022-04-25 16:06:30 +02:00
Moriz Wahl
22fcf28291 remove strange comments 2022-04-25 16:06:18 +02:00
Moriz Wahl
89dea79ce1
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:05:24 +02:00
0299fffbee
Merge branch 'master' into database_admin_pending_creations_decimal
# Conflicts:
#	backend/src/config/index.ts
2022-04-25 15:13:03 +02:00
Moriz Wahl
0264931e58 test update user infos mutation. Remove publisher ID from update user infos as it is never used 2022-04-25 14:07:31 +02:00
Moriz Wahl
e30d1f723f test queryOptIn 2022-04-25 13:18:08 +02:00
Moriz Wahl
276a1be889 test forgot password mutation 2022-04-25 12:49:23 +02:00
Moriz Wahl
d346a1d09d test verify login 2022-04-25 11:52:10 +02:00
56ed35d692
backend fix types for admin_pending_creations is now decimal 2022-04-21 13:49:29 +02:00
Moriz Wahl
50bddf49e4 fix test for User.isAdmin as nullable date 2022-04-21 11:16:14 +02:00
Wolfgang Huß
0c0bfe1a10 Rename to filterByActivated and filterByDeleted 2022-04-21 10:52:11 +02:00
Wolfgang Huß
621786c91d Rename after suggestion emailChecked withActivated and deletedAt to withDeleted 2022-04-21 07:54:41 +02:00
Wolfgang Huß
9761b4afa6 Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted 2022-04-21 07:23:03 +02:00
Moriz Wahl
e3a807ed95
Merge branch 'master' into eliminate-server-user-table 2022-04-20 13:08:43 +02:00
Moriz Wahl
c9701574f3 seed with isAdmin, test user resolver with isAdmin 2022-04-20 11:44:34 +02:00
Moriz Wahl
64859a71f4 use isAdmin on user to determine if user is admin 2022-04-20 11:27:09 +02:00
Wolfgang Huß
e8aba86430 Rename isDeleted to deletedAt 2022-04-20 08:53:12 +02:00
Wolfgang Huß
03e1624c11 Rename isEmailChecked to emailChecked 2022-04-20 08:48:13 +02:00
Wolfgang Huß
145989e284 Replace notActivated by isEmailChecked 2022-04-19 14:43:25 +02:00
Moriz Wahl
1b0f53ca64
Merge branch 'master' into refactor-balance-model 2022-04-19 11:10:24 +02:00
Wolfgang Huß
8205e88b2f Comply Ulf's suggestions 2022-04-14 14:19:40 +02:00
Wolfgang Huß
f94dc967c0 Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
2022-04-13 10:26:49 +02:00
Moriz Wahl
a6e7036339 remove unused fields from balance model 2022-04-12 21:34:33 +02:00
Moriz Wahl
de6421201d use getUser helper to get moderator form context 2022-04-12 19:04:29 +02:00
Wolfgang Huß
563afcbf2a Add EMAIL_CLIENT_URI in config
- Increment config version.
- Correct usage of EMAIL_CLIENT_URI.
2022-04-12 15:36:05 +02:00