1402 Commits

Author SHA1 Message Date
Moriz Wahl
681d34b1dc rounding in virtual decay transaction, pass hold available amount to virtual decay creation 2022-03-31 22:17:36 +02:00
9ed00edc52
code order & comment 2022-03-31 12:14:38 +02:00
592e16e260
virtual decay transaction is based on full sum not including the link values 2022-03-31 12:09:00 +02:00
d349a46f5d
Balance Resolver: calculate Decay on full sum, not including the links 2022-03-31 12:08:09 +02:00
014306574d
v1.7.0 2022-03-30 20:42:56 +02:00
Moriz Wahl
3ad9685a82
Merge branch 'master' into fix-no-email-exposed-on-forgot-password 2022-03-30 20:22:44 +02:00
Moriz Wahl
1a76409a48
Merge branch 'master' into fix-wrong-decay-transaction-balance 2022-03-30 19:52:32 +02:00
Moriz Wahl
3078315286 change name and tpye of query sendResetPasswordEmail to mutation forgotPassword. Do not throw when email is not found 2022-03-30 18:24:44 +02:00
Moriz Wahl
0ab4f73f3b subtract the hold available amount from last transaction balance for virtual decay transaction 2022-03-30 15:10:36 +02:00
Moriz Wahl
5b10a87071 update env template 2022-03-30 13:59:55 +02:00
10ae00dba8
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 20:31:05 +02:00
Moriz Wahl
1db61b3efd
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 20:22:20 +02:00
Moriz Wahl
07ad22b71d change function name to print time duration 2022-03-29 20:10:00 +02:00
Moriz Wahl
a38a7889a3
Merge branch 'master' into refactor-balance-resolver 2022-03-29 19:59:12 +02:00
Moriz Wahl
8d1eff0765 new config version 2022-03-29 19:57:52 +02:00
Moriz Wahl
a4b30b385f
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 19:49:24 +02:00
Moriz Wahl
43242c98b4
Merge branch 'master' into refactor-balance-resolver 2022-03-29 16:15:33 +02:00
Moriz Wahl
90e6798a7d rename context.count to context.transactionCount 2022-03-29 16:10:06 +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
8fd93ff853 remove test for remove optin from DB after email verification 2022-03-29 02:58:36 +02:00
Moriz Wahl
633eef7c16 round GDD values in balance object 2022-03-29 02:34:13 +02:00
Moriz Wahl
feb89cf4e0 import transaction as db transaction 2022-03-29 01:58:20 +02:00
Moriz Wahl
51258b838e set rights correctly 2022-03-29 01:55:59 +02:00
Moriz Wahl
27ad1d2e22 transaction list model contains balance, user balance resolver to create transacton list result 2022-03-29 01:54:13 +02:00
Moriz Wahl
e9e97549a7 rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails 2022-03-29 01:12:07 +02:00
Moriz Wahl
d584651fc1 rename right to GDT_BALANCE 2022-03-29 01:11:25 +02:00
Moriz Wahl
a26aaae71a Merge branch 'master' into refactor-balance-resolver 2022-03-29 01:03:52 +02:00
Moriz Wahl
9eda41b24a Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email 2022-03-29 00:59:47 +02:00
Moriz Wahl
37e36e01af do not remove optin code in DB after email verification 2022-03-29 00:51:44 +02:00
Moriz Wahl
cb90249301 rename function, add parameter for optinType, sort by updatedAt DESC 2022-03-29 00:50:50 +02:00
Moriz Wahl
3128ede829
Merge branch 'master' into optin-valid-time 2022-03-29 00:34:04 +02:00
Alexander Friedland
d5b57dcf1c
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-28 18:00:25 +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
5456affb9c fix logic (not canResendOptIn), fix error strings 2022-03-24 19:27:32 +01:00
Moriz Wahl
9da2047e8c move sendActivationEmail mutation from user to admin resolver 2022-03-24 19:14:59 +01:00
Moriz Wahl
1e3300ad5a use optIn as naming convention 2022-03-24 18:38:24 +01:00
Moriz Wahl
607805075c refactor sendActivationEmail, get rid of getOptInCode function 2022-03-24 18:33:07 +01:00
Moriz Wahl
965ab22bab create helper functions for time management, rename some functions 2022-03-24 18:17:46 +01:00
Moriz Wahl
7cd920686d helper function to create a new email optin object. Use this in create user 2022-03-24 17:50:34 +01:00
Moriz Wahl
8718fdee7b add comentary to explain the meaning of the constants 2022-03-24 17:38:03 +01:00
Moriz Wahl
ac000296da enums for optin types 2022-03-24 17:37:07 +01:00
Moriz Wahl
30543942d8 check for valid min/max length of memeo before executing transaction 2022-03-24 14:36:16 +01:00
Moriz Wahl
0c0ce1b579 add new env variable to define email optin request time delay 2022-03-24 14:05:23 +01:00
Moriz Wahl
34d3893f1c Merge branch 'master' into optin-valid-time 2022-03-24 14:00:41 +01:00
09360f70ee
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-24 11:28:58 +01:00
Moriz Wahl
bd79d63783
Merge branch 'master' into add-sender-email-to-transaction-mail 2022-03-23 20:59:31 +01:00
Moriz Wahl
3509087166
Update backend/src/mailer/text/transactionReceived.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-23 20:59:13 +01:00