Private
Public Access
1
0
Commit Graph

1109 Commits

Author SHA1 Message Date
Sander Roosendaal
cba92b8619 some precautions against empty workouts 2017-05-09 09:52:37 +02:00
Sander Roosendaal
faa8fa5316 Merge branch 'develop' into feature/uploadpage 2017-05-09 08:42:40 +02:00
Sander Roosendaal
358782fc0f trainingpeaks to production 2017-05-08 18:10:18 +02:00
Sander Roosendaal
0fa374e9e7 Merge tag 'v2.43' into develop
hotfix TP sync
2017-05-07 07:08:39 +02:00
Sander Roosendaal
5e5cd625c8 Merge branch 'hotfix/v2.43' 2017-05-07 07:08:09 +02:00
Sander Roosendaal
e41e1e0ba8 bug fixes TP sync 2017-05-07 07:05:24 +02:00
Sander Roosendaal
4b80e30b74 Strava, ST, RK done 2017-05-05 11:54:37 +02:00
Sander Roosendaal
25c67319f8 now working 2017-05-05 08:40:28 +02:00
Sander Roosendaal
4727c1fafb added brochure but doesn't show up 2017-05-05 08:35:38 +02:00
Sander Roosendaal
177c3cad74 Merge tag 'v2.42' into develop
TP bug fixes
2017-05-04 22:17:44 +02:00
Sander Roosendaal
4ba34cf84e Merge branch 'release/v2.42' 2017-05-04 22:16:49 +02:00
Sander Roosendaal
027353338d TP stuff 2017-05-04 22:14:59 +02:00
Sander Roosendaal
fc5de87053 Merge tag 'v2.41' into develop
rowingphysics improvements
2017-05-04 21:12:22 +02:00
Sander Roosendaal
315c8c26db Merge branch 'release/v2.41' 2017-05-04 20:22:35 +02:00
Sander Roosendaal
45a5199fb1 Merge tag 'v2.4' into develop
runkeeper bug fix
2017-05-04 20:14:51 +02:00
Sander Roosendaal
b88a0d7f69 Merge branch 'hotfix/v2.4' 2017-05-04 20:06:40 +02:00
Sander Roosendaal
55dd98cbae runkeeper 2017-05-04 20:04:13 +02:00
Sander Roosendaal
d633cbe812 removed some double filtering 2017-05-04 16:04:18 +02:00
Sander Roosendaal
69a7c00f9c Merge branch 'feature/betterphysics' into develop 2017-05-04 15:30:24 +02:00
Sander Roosendaal
24a14e7e33 some debugging of OTW physics 2017-05-04 15:29:24 +02:00
Sander Roosendaal
e82aabc0ca removed equivalent erg pace 2017-05-04 13:57:47 +02:00
Sander Roosendaal
047d7782c5 better empower detection in physics calc 2017-05-04 12:59:56 +02:00
Sander Roosendaal
abaae8b442 nothing 2017-05-04 09:15:38 +02:00
Sander Roosendaal
ca7f58e139 Merge tag 'v2.39' into develop
removing headers checking
2017-05-04 09:07:23 +02:00
Sander Roosendaal
520932eb0a Merge branch 'release/v2.39' 2017-05-04 09:07:03 +02:00
Sander Roosendaal
6523fdd49d removing headers info 2017-05-04 09:05:52 +02:00
Sander Roosendaal
3e9cdc0325 Merge tag 'v2.38' into develop
checking headers
2017-05-04 09:00:29 +02:00
Sander Roosendaal
b4b642399c Merge branch 'release/v2.38' 2017-05-04 08:59:57 +02:00
Sander Roosendaal
a180f1b14a checking headers 2017-05-04 08:58:18 +02:00
Sander Roosendaal
5fdb7fda43 Merge tag 'v2.37' into develop
headers
2017-05-04 08:56:00 +02:00
Sander Roosendaal
26a01c3e13 Merge branch 'release/v2.37' 2017-05-04 08:55:42 +02:00
Sander Roosendaal
d4f93cbd40 added headers 2017-05-04 08:54:29 +02:00
Sander Roosendaal
ad559a668a Merge tag 'v2.36' into develop
bug fix
2017-05-04 08:41:21 +02:00
Sander Roosendaal
4d61c78d2e Merge branch 'release/v2.36' 2017-05-04 08:40:52 +02:00
Sander Roosendaal
6225751df0 bug fix 2017-05-04 08:38:43 +02:00
Sander Roosendaal
0543b6eb4c Merge tag 'v2.35' into develop
bug fix
2017-05-04 08:35:26 +02:00
Sander Roosendaal
a124463f89 Merge branch 'release/v2.35' 2017-05-04 08:35:11 +02:00
Sander Roosendaal
6e63b17bff bug fix 2017-05-04 08:33:52 +02:00
Sander Roosendaal
9f9c30cae2 Merge tag 'v2.34' into develop
TP improvements
2017-05-04 08:28:19 +02:00
Sander Roosendaal
6c2c327049 Merge branch 'release/v2.34' 2017-05-04 08:27:26 +02:00
Sander Roosendaal
d703438fd2 mention error status in TP 2017-05-04 08:07:50 +02:00
Sander Roosendaal
ee831ce88c label names 2017-05-03 21:58:34 +02:00
Sander Roosendaal
7643a6c75c Merge tag 'v2.33' into develop
time axis for flexall pace
2017-05-03 21:49:01 +02:00
Sander Roosendaal
6c418c3099 Merge branch 'release/v2.33' 2017-05-03 21:48:33 +02:00
Sander Roosendaal
d19c3e7785 y axis for pace chart 2017-05-03 17:28:08 +02:00
Sander Roosendaal
0d049c2c0b Merge tag 'v2.32' into develop
hotfix
2017-05-03 17:10:21 +02:00
Sander Roosendaal
58faaa8565 Merge branch 'hotfix/v2.32' 2017-05-03 17:10:00 +02:00
Sander Roosendaal
700b59bb02 small data cleaning for cum flex chart 2017-05-03 17:06:31 +02:00
Sander Roosendaal
5c0631a6a8 Merge tag 'v2.31' into develop
cumulative flex plot also for OTW
2017-05-03 16:42:43 +02:00
Sander Roosendaal
7e665400b9 Merge branch 'release/v2.31' 2017-05-03 16:42:23 +02:00