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 |
|
Sander Roosendaal
|
8da86e610d
|
done runkeeper
|
2018-07-03 22:01:53 +02:00 |
|
Sander Roosendaal
|
ce53c29fee
|
c2, strava done, almost done st
|
2018-07-03 17:02:45 +02:00 |
|
Sander Roosendaal
|
f1d3326a2d
|
Merge tag 'v7.15' into develop
bug fix
|
2018-07-03 08:28:22 +02:00 |
|
Sander Roosendaal
|
5dec4db71e
|
Merge branch 'hotfix/v7.15'
|
2018-07-03 08:28:06 +02:00 |
|
Sander Roosendaal
|
2ac5f8ac43
|
fixing bug for imports
|
2018-07-03 08:17:03 +02:00 |
|
Sander Roosendaal
|
3421d1a685
|
strava done
|
2018-07-02 23:15:21 +02:00 |
|
Sander Roosendaal
|
afb58ef6e4
|
added first strava test
|
2018-07-01 22:34:34 +02:00 |
|
Sander Roosendaal
|
977a2da0f8
|
some comments to clarify prepped
|
2018-07-01 22:21:22 +02:00 |
|
Sander Roosendaal
|
d69c15254f
|
mocked all c2stuff except workout export
|
2018-07-01 22:15:36 +02:00 |
|
Sander Roosendaal
|
4214a4fcfc
|
timezone selector in workout edit form
|
2018-07-01 17:21:18 +02:00 |
|
Sander Roosendaal
|
6a0c819ea3
|
added c2list test
|
2018-07-01 17:07:03 +02:00 |
|
Sander Roosendaal
|
cbaada7945
|
mocking c2import successfully
|
2018-07-01 13:23:24 +02:00 |
|
Sander Roosendaal
|
e8dd12c8b8
|
merged develop
|
2018-06-29 23:51:48 +02:00 |
|
Sander Roosendaal
|
b68187df87
|
Merge branch 'develop' into feature/revisedimports
|
2018-06-29 23:31:29 +02:00 |
|
Sander Roosendaal
|
200ff3c43f
|
deleted some prints
|
2018-06-29 23:23:10 +02:00 |
|
Sander Roosendaal
|
02dee883a1
|
Merge tag 'v7.14' into develop
strava import differently
|
2018-06-29 23:13:53 +02:00 |
|
Sander Roosendaal
|
7b9e7ac19f
|
Merge branch 'release/v7.14'
|
2018-06-29 23:13:40 +02:00 |
|
Sander Roosendaal
|
89cf064f03
|
fixed
|
2018-06-29 23:10:19 +02:00 |
|
Sander Roosendaal
|
9ab9734fb9
|
Merge branch 'develop' into feature/revisedimports
|
2018-06-28 16:46:08 +02:00 |
|