1828 Commits

Author SHA1 Message Date
Moriz Wahl
f1686523df add link information to reset password email 2022-03-23 16:57:04 +01:00
Moriz Wahl
d1644ad2ae add information about link duration and how to get a new link in email 2022-03-23 16:49:30 +01:00
Moriz Wahl
3d613e72f5 add link to forgot-password 2022-03-23 16:48:35 +01:00
Moriz Wahl
ca0d97c47c test printEmailCodeValidTime 2022-03-23 16:03:52 +01:00
Moriz Wahl
662285161c time span for email code valid time 2022-03-23 14:28:24 +01:00
Moriz Wahl
2faad50919 set email code valid time to 24h 2022-03-23 13:33:07 +01:00
Moriz Wahl
807922a8d5 redeem code in email link config 2022-03-23 09:17:15 +01:00
Moriz Wahl
767387bb7c change {code} to {optin} to avoid confusion when redeem code is provided 2022-03-23 09:05:39 +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
9b53458655 fix test 2022-03-22 19:38:51 +01:00
Moriz Wahl
9c8599528e allow null for redeemCode 2022-03-22 19:24:58 +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
Alexander Friedland
eda69bfc47
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-22 12:34:17 +01:00
Alexander Friedland
7929b93964
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-22 12:33:10 +01:00
Alexander Friedland
fe869e12c4
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-22 12:31:44 +01:00
Hannes Heine
2457371300
Merge branch 'master' into add-referrer-id-to-users 2022-03-22 09:50:09 +01:00
ogerly
8a2ca07b2e test UserResolver.test.js ok, with redeemCode 2022-03-22 07:09:58 +01:00
Moriz Wahl
98fd9d287a Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register 2022-03-21 17:29:14 +01:00
Moriz Wahl
5eccddec05 test that referrerId is present 2022-03-21 17:28:48 +01:00
Moriz Wahl
2b7d9d8c1a save referrer ID when present on register 2022-03-21 17:23:56 +01:00
Moriz Wahl
3fe6206763 Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register 2022-03-21 17:16:00 +01:00
Moriz Wahl
88cd631bca update database version 2022-03-21 17:04:45 +01:00
ogerly
2ea7cf6705 merge #1588 and resolve conflicts 2022-03-21 14:57:43 +01:00
Alexander Friedland
1baf855265
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 14:37:04 +01:00
Moriz Wahl
62384b1056
Merge branch 'master' into no-float-ids 2022-03-21 14:05:51 +01:00
Alexander Friedland
8bbe9401b0
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 13:08:48 +01:00
elweyn
ed1c3bf137 Withdrew else block after throwing an error. 2022-03-21 12:44:03 +01:00
c83959fc58
Merge branch 'master' into 1319-email-optin 2022-03-21 12:30:57 +01:00
ogerly
a23777b6ec uncomment code activationLink 2022-03-21 12:07:59 +01:00
ogerly
15e0186381 add redeemCode on register process for createUser 2022-03-21 10:54:56 +01:00
ogerly
3992882962 add redeemCode on UserResolver.ts 2022-03-21 10:29:56 +01:00
ogerly
1f1cd67b9e add redeemCode 2022-03-21 10:29:13 +01:00
Alexander Friedland
7210804a72
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-20 19:11:28 +01:00
Moriz Wahl
384fd12b63 change parameter name to code 2022-03-20 19:00:36 +01:00
Moriz Wahl
e9357198c0 change parameter name to code 2022-03-20 18:58:20 +01:00
ogerly
1315ab4fa0 change parameter id from Int to String 2022-03-20 11:25:18 +01:00
Moriz Wahl
7dfa0e37ee fix: id parameter to Int in seed 2022-03-19 13:08:37 +01:00
Moriz Wahl
612b8ca69c Merge branch 'master' into no-float-ids 2022-03-19 13:07:53 +01:00
Moriz Wahl
7f6b7482b0 Int as arg type for ID 2022-03-19 12:35:34 +01:00
Moriz Wahl
8038f1bf9b include deleted links 2022-03-19 12:29:43 +01:00
761de3f636
corrected name of transaction link summary to differentiate between a link and the summary transaction 2022-03-19 10:43:17 +01:00
Moriz Wahl
550a55a4f0
Merge branch 'master' into user-entity-in-context 2022-03-18 15:23:48 +01:00
4c0996aefb
Merge branch 'master' into resolve_external_paths 2022-03-18 15:15:51 +01:00
Moriz Wahl
303ab94ba3
Merge branch 'master' into user-entity-in-context 2022-03-18 15:13:11 +01:00
677581b76e
enforce config on backend 2022-03-18 03:13:00 +01:00
5fe1e05ca4
use tsconfig-paths package to resolve paths
link build and src paths for the external database package
2022-03-18 01:35:01 +01:00
Moriz Wahl
b84b4e27b4 undo changes in plugin 2022-03-17 13:07:47 +01:00
Moriz Wahl
4c396d7581 define Int as type for args of Ids 2022-03-17 13:03:41 +01:00