Moriz Wahl
|
9c8599528e
|
allow null for redeemCode
|
2022-03-22 19:24:58 +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 |
|
|
|
2a5db25c43
|
Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register
|
2022-03-22 12:21:51 +01:00 |
|
Moriz Wahl
|
9a040bb84d
|
Merge pull request #1654 from gradido/add-referrer-id-to-users
feat: Add Referrer ID to Users
|
2022-03-22 12:21:29 +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 |
|
ogerly
|
4675c56790
|
test router.test.js fixed
|
2022-03-21 21:38:28 +01:00 |
|
Moriz Wahl
|
3057203d7c
|
Merge branch '1559-frontend-transport-redeem-link-through-register' of github.com:gradido/gradido into 1559-frontend-transport-redeem-link-through-register
|
2022-03-21 17:29:28 +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 |
|
Alexander Friedland
|
32d8cf4a9d
|
Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register
|
2022-03-21 17:25:41 +01:00 |
|
Alexander Friedland
|
5d8fed9c31
|
Merge pull request #1625 from gradido/1588-frontend-show-link-information
1558 - show tranaction link information page
|
2022-03-21 17:24:32 +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
|
8c802a9bee
|
add referrerId to entity model of User
|
2022-03-21 17:08:56 +01:00 |
|
Moriz Wahl
|
88cd631bca
|
update database version
|
2022-03-21 17:04:45 +01:00 |
|
Moriz Wahl
|
f49610aef4
|
add referrer id migration
|
2022-03-21 17:03:20 +01:00 |
|
Moriz Wahl
|
eaa621cc3a
|
coverage unit tests forntend tp 95%
|
2022-03-21 16:39:13 +01:00 |
|
Moriz Wahl
|
be8e3f489e
|
test with param code
|
2022-03-21 16:37:44 +01:00 |
|
Moriz Wahl
|
5baa14b359
|
test transaction link page
|
2022-03-21 16:25:17 +01:00 |
|
ogerly
|
2ea7cf6705
|
merge #1588 and resolve conflicts
|
2022-03-21 14:57:43 +01:00 |
|
Moriz Wahl
|
c57b40adc1
|
test Register with Redeem Code
|
2022-03-21 14:56:37 +01:00 |
|
Moriz Wahl
|
44f8155755
|
Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information
|
2022-03-21 14:54:53 +01:00 |
|
ogerly
|
ea99db0159
|
yarn lint and locales fixed
|
2022-03-21 14:50:50 +01:00 |
|
ogerly
|
9377102f00
|
deleted v-else
|
2022-03-21 14:46:14 +01:00 |
|
ogerly
|
f8882fa63a
|
remove computed
|
2022-03-21 14:41:50 +01:00 |
|
Moriz Wahl
|
8bfe350026
|
Merge branch '1588-frontend-show-link-information' of github.com:gradido/gradido into 1588-frontend-show-link-information
|
2022-03-21 14:39:49 +01:00 |
|
ogerly
|
7850127ae2
|
after login go to redeem page
|
2022-03-21 14:38:19 +01:00 |
|
Alexander Friedland
|
1baf855265
|
Merge branch 'master' into 1588-frontend-show-link-information
|
2022-03-21 14:37:04 +01:00 |
|
Moriz Wahl
|
efe8d0c63b
|
Merge pull request #1624 from gradido/no-float-ids
refactor: No Float Ids
|
2022-03-21 14:32:50 +01:00 |
|
Moriz Wahl
|
17bfbd6281
|
fix test for optional code on login on register
|
2022-03-21 14:29:00 +01:00 |
|
Moriz Wahl
|
62384b1056
|
Merge branch 'master' into no-float-ids
|
2022-03-21 14:05:51 +01:00 |
|
Alexander Friedland
|
c2d0b566a8
|
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-03-21 14:05:41 +01:00 |
|
ogerly
|
b68fab72cc
|
review from ulf and hannes
|
2022-03-21 14:02:04 +01:00 |
|
Alexander Friedland
|
e41f594fbd
|
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-03-21 13:50:50 +01:00 |
|
Alexander Friedland
|
db0297b826
|
Update frontend/src/locales/de.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-03-21 13:50:35 +01:00 |
|
Alexander Friedland
|
be319ba5e4
|
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-03-21 13:50:17 +01:00 |
|
Alexander Friedland
|
07bf90e483
|
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-03-21 13:49:19 +01:00 |
|
Alexander Friedland
|
8bbe9401b0
|
Merge branch 'master' into 1588-frontend-show-link-information
|
2022-03-21 13:08:48 +01:00 |
|
ogerly
|
58a7bc0e2a
|
delete redeem
|
2022-03-21 13:08:11 +01:00 |
|
ogerly
|
12f2f2845a
|
remove store redeem and add params code
|
2022-03-21 13:05:31 +01:00 |
|
Hannes Heine
|
5dc903bfb1
|
Merge pull request #1336 from gradido/1319-email-optin
Change the text if the account is not activated yet and changed the b…
|
2022-03-21 12:54:20 +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
|
042741a9aa
|
add code to push
|
2022-03-21 12:11:59 +01:00 |
|
ogerly
|
6d257825e2
|
add redeemCode to login button
|
2022-03-21 12:11:19 +01:00 |
|
ogerly
|
cdd13cf24e
|
add params on thx and checkEmail
|
2022-03-21 12:09:07 +01:00 |
|
ogerly
|
a23777b6ec
|
uncomment code activationLink
|
2022-03-21 12:07:59 +01:00 |
|
