230 Commits

Author SHA1 Message Date
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
Moriz Wahl
296749d207 shorthand 2022-03-22 19:06:55 +01:00
Moriz Wahl
ab0f7c8c7e add listTransactionLinksAdmin query 2022-03-22 18:51:41 +01:00
Moriz Wahl
612b8ca69c Merge branch 'master' into no-float-ids 2022-03-19 13:07:53 +01:00
Moriz Wahl
4c396d7581 define Int as type for args of Ids 2022-03-17 13:03:41 +01:00
Moriz Wahl
e8625cb5af remove console log 2022-03-17 11:32:52 +01:00
Moriz Wahl
f21e0ed038 only creations transaction list with admin rights 2022-03-17 11:20:26 +01:00
Moriz Wahl
fd9292b3d5 user context in admin interface 2022-03-17 09:57:19 +01:00
Moriz Wahl
0136a22f0c resolve relative paths in resolvers 2022-03-07 21:35:50 +01:00
22c65aa929
renamed TypeId to TransactiontypeId
fixed admin creation (backend part)
2022-03-04 15:12:51 +01:00
ae4ad937aa
fix transaction type id - too much change 2022-03-04 14:50:20 +01:00
91fda4c097
Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea 2022-03-04 14:43:39 +01:00
008331d43f
renamed lastUserTransaction to lastTransaction 2022-03-04 12:32:05 +01:00
Alexander Friedland
bb547a211e
Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea 2022-03-04 10:09:45 +01:00
850060d057
Merge branch 'master' into refactor_arithmetic 2022-03-03 17:25:57 +01:00
Moriz Wahl
c663843758 type_id in raw sql query 2022-03-03 16:54:34 +01:00
ogerly
38d53e61c0 TransactionTypeId to TypeId changed, *10000 removed, graphql refactor 2022-03-01 09:32:16 +01:00
50d13b10ab
Merge branch 'combine_transaction_tables2' into refactor_arithmetic
# Conflicts:
#	backend/src/config/index.ts
#	backend/src/graphql/model/Transaction.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	database/entity/Transaction.ts
#	database/src/interface/TransactionContext.ts
#	database/src/seeds/helpers/user-helpers.ts
2022-02-28 12:58:23 +01:00
4e017e4017
make transaction a const 2022-02-28 12:28:13 +01:00
b0b669ac34
lint fixes 2022-02-28 12:28:13 +01:00
dd0d4a19a2
fixed backend for new migration
properly write linked Transactions when sendCoin
2022-02-28 12:28:13 +01:00
33ce8a0799
Merge branch 'master' into combine_transaction_tables2 2022-02-28 12:21:54 +01:00
e988cf9371
defining precision in config seems to work properly afterall 2022-02-27 13:05:27 +01:00
9c27568f77
include decimal with precision definition 2022-02-27 03:09:18 +01:00
7644bf1834
backend compiles 2022-02-26 03:42:20 +01:00
c2dfd50654
make transaction a const 2022-02-24 12:51:47 +01:00
Moriz Wahl
ec143bd18f fix: No Creations for Deleted Users 2022-02-24 11:08:30 +01:00
32d5eacd13
lint fixes 2022-02-24 00:52:54 +01:00
3a35cbfee5
fixed backend for new migration
properly write linked Transactions when sendCoin
2022-02-24 00:41:44 +01:00
4ada6ea182
Merge branch 'master' into combine_transaction_tables2 2022-02-23 22:35:57 +01:00
7a837be7b2
backend is building 2022-02-23 21:46:40 +01:00
Moriz Wahl
5fccc66126
Merge branch 'master' into test-softdeleted 2022-02-23 18:13:07 +01:00
Alexander Friedland
937ccfbb9d
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-23 09:24:58 +01:00
Moriz Wahl
9c4d418384 fix merging problems 2022-02-23 08:34:59 +01:00
Moriz Wahl
57e9e825f1 fix: Possible SQL Exception in User Search 2022-02-23 08:18:06 +01:00
Alexander Friedland
947cbb659b
Merge branch 'master' into test-softdeleted 2022-02-22 20:31:47 +01:00
ogerly
510ee8a8df yarn lint --fix 2022-02-22 20:23:57 +01:00
ogerly
1b4f0d4b60 change Mutation in Date, nullable: true in DELETE_USER, UNDELETE_USER 2022-02-22 20:09:27 +01:00