Sander Roosendaal
|
ce53c29fee
|
c2, strava done, almost done st
|
2018-07-03 17:02:45 +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
|
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 |
|
Sander Roosendaal
|
951e707b6e
|
changed admin
|
2018-06-28 16:40:07 +02:00 |
|
Sander Roosendaal
|
04bbbda2a8
|
Merge tag 'v7.13' into develop
moving strava processing to the right
|
2018-06-28 16:22:34 +02:00 |
|
Sander Roosendaal
|
686c92346f
|
Merge branch 'hotfix/v7.13'
|
2018-06-28 16:22:16 +02:00 |
|
Sander Roosendaal
|
d4b5314e9e
|
moved strava to the back
|
2018-06-28 16:20:48 +02:00 |
|
Sander Roosendaal
|
2605c1dec3
|
Merge tag 'v7.12' into develop
fix
|
2018-06-28 16:16:02 +02:00 |
|
Sander Roosendaal
|
94d2b8b7f5
|
Merge branch 'hotfix/v7.12'
|
2018-06-28 16:15:35 +02:00 |
|
Sander Roosendaal
|
e67e55bbb7
|
fixed
|
2018-06-28 16:14:24 +02:00 |
|
Sander Roosendaal
|
40c302b014
|
Merge tag 'v7.11' into develop
through emails
|
2018-06-28 15:32:39 +02:00 |
|
Sander Roosendaal
|
120b105118
|
Merge branch 'hotfix/v7.11'
|
2018-06-28 15:32:03 +02:00 |
|
Sander Roosendaal
|
35b71c0b63
|
through emails now
|
2018-06-28 15:31:21 +02:00 |
|
Sander Roosendaal
|
6acb5d9f49
|
through email now
|
2018-06-28 14:26:08 +02:00 |
|
Sander Roosendaal
|
9a11102dcd
|
Merge tag 'v7.10' into develop
adding rowingdata purification step
|
2018-06-28 13:36:48 +02:00 |
|
Sander Roosendaal
|
f3edead9b9
|
Merge branch 'hotfix/v7.10'
|
2018-06-28 13:35:55 +02:00 |
|
Sander Roosendaal
|
13f98d1f54
|
trying reading rdata
|
2018-06-28 13:34:52 +02:00 |
|
Sander Roosendaal
|
63fb915c00
|
Merge tag 'v7.09' into develop
hot fix
|
2018-06-28 10:09:36 +02:00 |
|
Sander Roosendaal
|
3f9ccd3962
|
Merge branch 'hotfix/v7.09'
|
2018-06-28 10:09:22 +02:00 |
|
Sander Roosendaal
|
5eb2edc60f
|
moving save routine to dataprepnodjango
|
2018-06-28 10:07:34 +02:00 |
|
Sander Roosendaal
|
5122cbd383
|
Merge tag 'v7.08' into develop
adding dropna
|
2018-06-27 21:43:51 +02:00 |
|
Sander Roosendaal
|
608a773566
|
Merge branch 'hotfix/v7.08'
|
2018-06-27 21:43:30 +02:00 |
|
Sander Roosendaal
|
7b93833056
|
adding message when saving import settings
|
2018-06-27 21:42:32 +02:00 |
|
Sander Roosendaal
|
2f31234aea
|
adding dropna
|
2018-06-27 21:41:11 +02:00 |
|
Sander Roosendaal
|
cda17057f7
|
Merge tag 'v7.07' into develop
removing velo
|
2018-06-27 21:13:30 +02:00 |
|
Sander Roosendaal
|
9439fa33ac
|
Merge branch 'hotfix/v7.07'
|
2018-06-27 21:12:56 +02:00 |
|
Sander Roosendaal
|
ca598438a1
|
removing velo
|
2018-06-27 21:12:05 +02:00 |
|
Sander Roosendaal
|
0e64ff0bb4
|
Merge tag 'v7.06' into develop
test
|
2018-06-27 21:08:52 +02:00 |
|
Sander Roosendaal
|
c15e0f8ad2
|
Merge branch 'hotfix/v7.06'
|
2018-06-27 21:07:50 +02:00 |
|
Sander Roosendaal
|
8c1e953acf
|
changed dict
|
2018-06-27 21:04:53 +02:00 |
|
Sander Roosendaal
|
9d2c7c04ac
|
Merge tag 'v7.05' into develop
bug fix
|
2018-06-27 19:04:18 +02:00 |
|
Sander Roosendaal
|
571d61b22c
|
Merge branch 'hotfix/v7.05'
|
2018-06-27 19:04:03 +02:00 |
|
Sander Roosendaal
|
b78a443a5c
|
another attempt
|
2018-06-27 19:03:27 +02:00 |
|
Sander Roosendaal
|
13d627a720
|
Merge tag 'v7.04' into develop
another attempts
|
2018-06-27 18:24:51 +02:00 |
|
Sander Roosendaal
|
38139eda15
|
Merge branch 'hotfix/v7.04'
|
2018-06-27 18:23:22 +02:00 |
|
Sander Roosendaal
|
c10c6fafe1
|
improved dataprepnodjango?
|
2018-06-27 18:22:24 +02:00 |
|
Sander Roosendaal
|
7189562931
|
Merge tag 'v7.03' into develop
change in velo model
|
2018-06-27 15:01:22 +02:00 |
|
Sander Roosendaal
|
f578f9911e
|
Merge branch 'hotfix/v7.03'
|
2018-06-27 15:00:51 +02:00 |
|
Sander Roosendaal
|
cb2c067516
|
no changes
|
2018-06-27 14:59:14 +02:00 |
|