Private
Public Access
1
0
Commit Graph

3116 Commits

Author SHA1 Message Date
Sander Roosendaal
ebefc67492 bug fixes 2018-07-09 18:36:56 +02:00
Sander Roosendaal
d83e8b58ce Merge branch 'release/v7.27' 2018-07-09 06:41:06 +02:00
Sander Roosendaal
5fed54097d repaired TrainingPeaks 2018-07-09 06:21:34 +02:00
Sander Roosendaal
2d84fd6cd0 bug fixes import export 2018-07-09 05:52:28 +02:00
Sander Roosendaal
e63c58a687 Merge tag 'v7.26' into develop
bug fix trimp
2018-07-08 21:36:35 +02:00
Sander Roosendaal
b8f85a916f Merge branch 'release/v7.26' 2018-07-08 21:36:02 +02:00
Sander Roosendaal
b964a728d8 removed some print statements 2018-07-08 21:35:05 +02:00
Sander Roosendaal
7b7171ca0f bug fix in trimp calc 2018-07-08 21:34:03 +02:00
Sander Roosendaal
d43f0e27af Merge tag 'v7.25' into develop
bug fix
2018-07-08 21:16:18 +02:00
Sander Roosendaal
e14aed92c9 Merge branch 'release/v7.25' 2018-07-08 21:15:41 +02:00
Sander Roosendaal
a3c6d72d0b fix token refresh bug 2018-07-08 21:13:34 +02:00
Sander Roosendaal
5b42e13ba0 bug fix tp_open 2018-07-08 20:11:23 +02:00
Sander Roosendaal
81c8dff8a0 Merge tag 'v7.24' into develop
bug fix
2018-07-08 12:10:41 +02:00
Sander Roosendaal
f5fb1ef419 Merge branch 'hotfix/v7.24' 2018-07-08 12:10:16 +02:00
Sander Roosendaal
d01334977e bug fix 2018-07-08 12:09:01 +02:00
Sander Roosendaal
e2b6c22bfd Merge tag 'v7.23' into develop
hotfix
2018-07-08 12:05:58 +02:00
Sander Roosendaal
2e70a51a49 Merge branch 'hotfix/v7.23' 2018-07-08 12:05:18 +02:00
Sander Roosendaal
2e8f4aed6c isprorower 2018-07-08 12:04:25 +02:00
Sander Roosendaal
08269d17e2 Merge tag 'v7.22' into develop
hot fix sporttracks export
2018-07-08 11:55:43 +02:00
Sander Roosendaal
a98aba9fe9 Merge branch 'release/v7.22' 2018-07-08 11:55:02 +02:00
Sander Roosendaal
8d3bcde04a sporttracks export fix 2018-07-08 11:38:18 +02:00
Sander Roosendaal
bda37d04c3 Merge tag 'v7.21' into develop
hotfix strava export
2018-07-08 09:53:26 +02:00
Sander Roosendaal
3ad74201e5 Merge branch 'hotfix/v7.21' 2018-07-08 09:52:38 +02:00
Sander Roosendaal
6b212eaaf0 hotfix 2018-07-08 09:51:33 +02:00
Sander Roosendaal
989e1c5ad6 Merge tag 'v7.20' into develop
repairing strava export
2018-07-08 09:38:28 +02:00
Sander Roosendaal
574b81207c Merge branch 'hotfix/v7.20' 2018-07-08 09:37:24 +02:00
Sander Roosendaal
203e0c470f hotfix 2018-07-08 09:36:11 +02:00
Sander Roosendaal
f444d2d4cf Merge tag 'v7.19' into develop
bug fix
2018-07-07 21:02:17 +02:00
Sander Roosendaal
da08501f4d Merge branch 'hotfix/v7.19' 2018-07-07 21:01:54 +02:00
Sander Roosendaal
b3a85b20d8 bug fix 2018-07-07 21:00:48 +02:00
Sander Roosendaal
27023dee39 Merge tag 'v7.18' into develop
tss and other calcs offline
2018-07-07 20:19:11 +02:00
Sander Roosendaal
a524250dee Merge branch 'release/v7.18' 2018-07-07 20:18:05 +02:00
Sander Roosendaal
0dc84b44b0 typo fix 2018-07-07 16:37:17 +02:00
Sander Roosendaal
f2f9718302 added plan to admin 2018-07-07 16:18:55 +02:00
Sander Roosendaal
75d5db185f small fixes 2018-07-07 16:13:19 +02:00
Sander Roosendaal
d1ddb9b242 removed duplicate import json entry 2018-07-07 08:51:48 +02:00
Sander Roosendaal
f17bbbb048 Merge tag 'v7.17' into develop
bug fix
2018-07-07 08:49:53 +02:00
Sander Roosendaal
63a5af74dd Merge branch 'hotfix/v7.17' 2018-07-07 08:48:05 +02:00
Sander Roosendaal
c018a726ea added import json to utils - bug fix 2018-07-07 08:46:48 +02:00
Sander Roosendaal
b9d43c7536 trimp, tss, hrtss, normv, normw pre-calculated 2018-07-06 18:06:04 +02:00
Sander Roosendaal
b1537bad88 Merge tag 'v7.16' into develop
hotfix
2018-07-06 16:35:01 +02:00
Sander Roosendaal
85be903eb8 Merge branch 'hotfix/v7.16' 2018-07-06 16:34:52 +02:00
Sander Roosendaal
f003b353ec bugfix - added check for zerodivisionerror 2018-07-06 16:34:02 +02:00
Sander Roosendaal
e544d5844b bug fix typo user is auth 2018-07-06 16:29:18 +02:00
Sander Roosendaal
45bf58673e Merge branch 'feature/revisedimports' into develop 2018-07-04 17:18:05 +02:00
Sander Roosendaal
07d6ec554b bla 2018-07-04 17:17:25 +02:00
Sander Roosendaal
101ab007fb removed invalid file 2018-07-04 16:58:10 +02:00
Sander Roosendaal
5960c276a8 Merge branch 'develop' into feature/revisedimports 2018-07-04 16:35:29 +02:00
Sander Roosendaal
6723194a30 using imports.py on all external APIs 2018-07-04 16:29:01 +02:00
Sander Roosendaal
45a6300c76 under armour & trainingpeaks done 2018-07-04 13:30:30 +02:00