Private
Public Access
1
0
Commit Graph

6954 Commits

Author SHA1 Message Date
Sander Roosendaal
bffefdb126 fix 2021-03-31 16:41:52 +02:00
Sander Roosendaal
af4dc4bc29 still not working token exchagen 2021-03-31 13:59:30 +02:00
Sander Roosendaal
d1bfd4e9af Merge branch 'develop' into feature/nklink 2021-03-31 11:57:30 +02:00
Sander Roosendaal
65d7f4d417 Merge branch 'feature/emailconfirm' into develop 2021-03-31 11:55:36 +02:00
Sander Roosendaal
0eec7bd707 updating new user registration test 2021-03-31 11:01:26 +02:00
Sander Roosendaal
ce22f51207 email confirmation for new coach users 2021-03-31 10:26:11 +02:00
Sander Roosendaal
51b085001d email confirmation for new user registration - still need coach 2021-03-31 08:52:55 +02:00
Sander Roosendaal
849bf49cd4 Merge branch 'hotfix/v15.9.12' into develop 2021-03-31 08:10:05 +02:00
Sander Roosendaal
e9b39d8350 small progress on nk link 2021-03-31 07:41:00 +02:00
Sander Roosendaal
0cd8fabc13 passing tests with mock server for nk workouts list 2021-03-30 09:05:26 +02:00
Sander Roosendaal
68edfe5a94 nkauthorize redirect works, callback not 2021-03-29 21:55:29 +02:00
Sander Roosendaal
c6ea8fb27c settings know about NK 2021-03-29 21:32:05 +02:00
Sander Roosendaal
a867e3742b fix 2021-03-29 21:29:11 +02:00
Sander Roosendaal
e78db19e7f Merge branch 'release/v15.9.11' 2021-03-28 13:52:03 +02:00
Sander Roosendaal
88df02f8ec fix bug 2021-03-28 13:51:36 +02:00
Sander Roosendaal
c1ce8c25eb add boat for virutal race improvements 2021-03-28 13:38:58 +02:00
Sander Roosendaal
1d360421c9 Merge branch 'release/v15.9.10' 2021-03-27 11:56:59 +01:00
Sander Roosendaal
6c17d31849 fix bug 2021-03-27 11:50:55 +01:00
Sander Roosendaal
b45931b23d Merge branch 'release/v15.9.9' 2021-03-27 11:34:36 +01:00
Sander Roosendaal
085abef04e adding links to plans 2021-03-27 09:55:21 +01:00
Sander Roosendaal
2f885ab2a0 Merge branch 'release/v15.9.8' 2021-03-26 02:51:07 +01:00
Sander Roosendaal
cf4dd9e128 form improvements 2021-03-26 02:44:39 +01:00
Sander Roosendaal
3bdcac6963 fix bug 2021-03-26 02:24:02 +01:00
Sander Roosendaal
e5b588213f Merge branch 'release/v15.9.7' 2021-03-25 08:23:59 +01:00
Sander Roosendaal
9137b19914 some fixes and more user friendly form to buy instantplan 2021-03-25 08:18:06 +01:00
Sander Roosendaal
8ff4232ff5 Merge branch 'release/v15.9.6' 2021-03-24 14:09:43 +01:00
Sander Roosendaal
389119144a fix 2021-03-24 12:02:23 +01:00
Sander Roosendaal
729d8e86ea Merge branch 'release/v15.9.5' 2021-03-24 07:57:54 +01:00
Sander Roosendaal
ca1f295964 adding url to plan 2021-03-24 07:57:31 +01:00
Sander Roosendaal
247cde4cf6 Merge branch 'release/v15.9.4' 2021-03-24 07:49:33 +01:00
Sander Roosendaal
0adad9cc09 ordering instant plans 2021-03-24 07:47:58 +01:00
Sander Roosendaal
d8a97ec62d Merge branch 'feature/transaction' into develop 2021-03-24 07:08:55 +01:00
Sander Roosendaal
1bdd497a0e fix - downgrade button still not working need a check 2021-03-24 07:08:35 +01:00
Sander Roosendaal
3f7d10f2bf fix 2021-03-24 06:58:12 +01:00
Sander Roosendaal
a9091bfed7 works but cannot change address 2021-03-24 06:35:25 +01:00
Sander Roosendaal
9a06a8902f can view plans and plans have a price 2021-03-23 21:10:29 +01:00
Sander Roosendaal
a7b46ed28d improving long step description 2021-03-23 15:11:22 +01:00
Sander Roosendaal
da5611005a cosmetic changes in training plan presentation 2021-03-23 10:20:26 +01:00
Sander Roosendaal
2abc533ada short notation for workouts 2021-03-23 09:13:15 +01:00
Sander Roosendaal
32ca95cf55 remove print statements 2021-03-22 21:13:16 +01:00
Sander Roosendaal
b63730ba76 changing default values approx dist and time 2021-03-22 20:48:40 +01:00
Sander Roosendaal
f807396b0a completing plan implementation form 2021-03-22 19:59:32 +01:00
Sander Roosendaal
c07b06328e fix 2021-03-22 19:30:56 +01:00
Sander Roosendaal
085cec6d43 small fix 2021-03-22 07:53:39 +01:00
Sander Roosendaal
e356e87cdd Merge branch 'release/v15.9.3' into develop 2021-03-21 14:07:27 +01:00
Sander Roosendaal
923f49ae19 Merge branch 'release/v15.9.3' 2021-03-21 14:07:17 +01:00
Sander Roosendaal
a2f5ea088d removed temp file 2021-03-21 14:07:04 +01:00
Sander Roosendaal
5e9875deb5 removed some obsolete tests 2021-03-21 14:06:38 +01:00
Sander Roosendaal
e0770a17e6 s 2021-03-21 13:37:29 +01:00
Sander Roosendaal
4b6d4c5072 er 2021-03-21 13:11:46 +01:00