1123 Commits

Author SHA1 Message Date
ogerly
3bd9e66079 add in backend deletedAt in UserAdmin.ts and AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js 2022-02-18 12:06:18 +01:00
185c38c12a
updated database version 2022-02-18 11:02:22 +01:00
Moriz Wahl
48435f0d8b Merge branch 'backend-tests-running-again' of github.com:gradido/gradido into backend-tests-running-again 2022-02-17 12:33:10 +01:00
Moriz Wahl
4a5d1980a5 afterAll at top 2022-02-17 12:32:51 +01:00
0683ff1999
fixed backend deletedAt instead of disabled 2022-02-17 10:53:49 +01:00
Moriz Wahl
631346b63c remove deleted entities 2022-02-16 13:19:27 +01:00
Moriz Wahl
1335bb8e26 activate UserResolver test again 2022-02-16 13:18:59 +01:00
a37b479158
fixed sendCoins 2022-02-16 12:29:16 +01:00
374841feb3
corrected migration name & config db version 2022-02-16 12:05:46 +01:00
Moriz Wahl
37354a010a
add test to ensure that the date of the decay start block cannot be changed by mistake 2022-02-16 11:51:32 +01:00
68d7d5e883
fix decay test 2022-02-16 11:51:32 +01:00
Alexander Friedland
912e35090a
Merge branch 'master' into static_decay_block 2022-02-16 11:51:01 +01:00
Moriz Wahl
2294997734 throw again when GDT server is not reachable 2022-02-16 09:39:42 +01:00
Moriz Wahl
efaef025ee do not throw error when GDT server is not reachable 2022-02-16 09:32:24 +01:00
Moriz Wahl
283cfcc84a GDT server not reachable error thrown 2022-02-16 09:23:58 +01:00
Moriz Wahl
58ee714e17 allow gdtSum to be null 2022-02-16 09:05:42 +01:00
Moriz Wahl
0697983c5e
Merge branch 'master' into do-not-throw-gdt-errors 2022-02-16 08:47:39 +01:00
Moriz Wahl
488a113ae7
Merge branch 'master' into admin_user_search_optimization 2022-02-15 14:13:33 +01:00
Alexander Friedland
5b892d761e
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-15 09:22:24 +01:00
Moriz Wahl
8fddffd466
Merge branch 'master' into do-not-throw-gdt-errors 2022-02-15 07:51:50 +01:00
6be7990142
mising space 2022-02-14 16:42:59 +01:00
a62b7e0d28
cancel hook on certain events before calculating data
ensure all required fields are present and cancel when thats not the case
2022-02-14 16:39:19 +01:00
Moriz Wahl
22c408f633 fix: Catch GDT Server Errors 2022-02-14 14:34:43 +01:00
f3b3fa2eba
do not query on email opt in type, since we have different ones and legacy types. Furthermore order the result of the query. 2022-02-14 13:45:48 +01:00
Moriz Wahl
1e6e056dcd
Merge branch 'master' into admin-email-confirmation 2022-02-14 13:20:53 +01:00
Moriz Wahl
70fd858cf8
Merge branch 'master' into admin-email-confirmation 2022-02-14 13:10:44 +01:00
Moriz Wahl
a201cad0db use lodash clonedeep to copy objects 2022-02-14 12:57:24 +01:00
760b7e2d01
renamed data2 to dataCopy 2022-02-14 10:24:06 +01:00
820cdfb16f
do not log password and token to the console 2022-02-14 09:51:06 +01:00
14dfb22593
corrected database version 2022-02-14 08:32:06 +01:00
Moriz Wahl
a79f1067ef
Merge branch 'master' into admin_user_search_optimization 2022-02-13 15:08:14 +01:00
einhornimmond
84d7f17d85
Update backend/src/typeorm/repository/User.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-02-13 13:33:44 +01:00
1a1e011e6d
null fields when there is no valid integer arriving from elopage.
Furthermore try catch on save to prevent server crashes
2022-02-13 12:41:16 +01:00
Einhornimmond
692433ce51 try fix linting 2022-02-13 09:22:05 +01:00
Einhornimmond
cdd31ccba9 fix nested where conditions 2022-02-12 12:41:13 +01:00
Moriz Wahl
15a9af4552
Merge branch 'master' into admin-email-confirmation 2022-02-11 16:29:05 +01:00
Alexander Friedland
03dcdf5100
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-11 16:18:25 +01:00
Moriz Wahl
8796e683d7
Merge branch 'master' into 833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful 2022-02-11 15:25:53 +01:00
Moriz Wahl
e9149d9644
Merge branch 'master' into admin-email-confirmation 2022-02-11 15:05:06 +01:00
Moriz Wahl
a347b337c6 take createdAt if updatedAt is not present 2022-02-11 14:55:31 +01:00
ogerly
5319f6de1e remove string 'recipiant not known' to 'recipiant not known' 2022-02-11 12:10:00 +01:00
Einhornimmond
6e63bacba7 let handle mysql the paging 2022-02-11 10:15:09 +01:00
Moriz Wahl
0a545c5fbe fix missing negator 2022-02-10 08:14:58 +01:00
Moriz Wahl
b3be4f664a add date of last email confirmation send to admin user 2022-02-10 08:05:25 +01:00
Moriz Wahl
2c88bc0383 remove query for checkEmail as it is included in the user model now 2022-02-10 07:32:39 +01:00
Moriz Wahl
32fdd77ac7 fix: Wrong Email Spelling in German 2022-02-09 12:23:07 +01:00
Alexander Friedland
7b2589699c
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-09 11:45:13 +01:00
ee94c655ef
fix elopage buys not using repository but entity 2022-02-08 15:59:59 +01:00
Alexander Friedland
af3dd430e7
Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area 2022-02-08 15:56:31 +01:00
Alexander Friedland
55573ea2ce
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-08 08:31:13 +01:00