317 Commits

Author SHA1 Message Date
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
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
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
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
6d48b6f4e3 fix: Confirm Creation with Decimal 2022-04-26 09:27:55 +02:00
56ed35d692
backend fix types for admin_pending_creations is now decimal 2022-04-21 13:49:29 +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ß
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
de6421201d use getUser helper to get moderator form context 2022-04-12 19:04:29 +02:00
Moriz Wahl
9a390c11db use Context interface in admin resolver 2022-04-11 15:57:59 +02:00
10ae00dba8
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 20:31:05 +02:00
Moriz Wahl
07ad22b71d change function name to print time duration 2022-03-29 20:10:00 +02:00
Moriz Wahl
0c5719140d Merge branch 'master' into optin-valid-time 2022-03-29 16:05:56 +02:00
d95e4d864a
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 12:43:13 +02:00
Moriz Wahl
cb90249301 rename function, add parameter for optinType, sort by updatedAt DESC 2022-03-29 00:50:50 +02:00
ogerly
549a36cb56 add linkCount and linkList in query 2022-03-25 20:17:33 +01:00
33638598a0
notActivated & isDeleted are both nullable
Admin User Search is a nightmare codewise
2022-03-25 13:43:53 +01:00
58eacb85ce
do not show unactivated emails in masscreation list 2022-03-25 13:35:33 +01:00
Moriz Wahl
9da2047e8c move sendActivationEmail mutation from user to admin resolver 2022-03-24 19:14:59 +01:00
Moriz Wahl
d1770ccb1a default values for filters 2022-03-23 08:20:37 +01:00
Moriz Wahl
d0b2a28ae2 add simple filter for list transaction link admin query 2022-03-23 07:43:16 +01:00