Private
Public Access
1
0
Commit Graph

847 Commits

Author SHA1 Message Date
Sander Roosendaal
89f33ea804 completed functionality and tested 2017-03-24 10:49:54 +01:00
Sander Roosendaal
44afa5ef47 Merge branch 'feature/runkeeper' into develop 2017-03-23 21:41:34 +01:00
Sander Roosendaal
9573f60d3a added RunKeeper to export page 2017-03-23 21:11:54 +01:00
Sander Roosendaal
08c0838d85 runkeeper functionality complete (not fully tested) 2017-03-23 20:07:10 +01:00
Sander Roosendaal
d89219a2df working on workout import (auth and workout list done) 2017-03-22 15:55:13 +01:00
Sander Roosendaal
01fe1e8807 added receiver on Rower change (removes teams) 2017-03-22 12:23:26 +01:00
Sander Roosendaal
bb23251c79 Merge tag 'v1.63' into develop
fixed bug in ote-bests (blank form)
2017-03-21 19:02:48 +01:00
Sander Roosendaal
cb3a25ae5a Merge branch 'hotfix/v1.63' 2017-03-21 19:02:02 +01:00
Sander Roosendaal
fd91d34af9 fix zero or blank value in date form ote-bests view 2017-03-21 19:01:03 +01:00
Sander Roosendaal
a84c223033 remove password from registration email 2017-03-19 21:04:42 +01:00
Sander Roosendaal
c25814a376 Merge tag 'v1.62' into develop
bugfix comment
2017-03-12 23:34:41 +01:00
Sander Roosendaal
d9c696fb14 Merge branch 'hotfix/v1.62' 2017-03-12 23:34:10 +01:00
Sander Roosendaal
5a06fdcea6 fix in comments 2017-03-12 23:33:24 +01:00
Sander Roosendaal
48ef0e65cd Merge tag 'v1.61' into develop
bugfix
2017-03-12 23:22:56 +01:00
Sander Roosendaal
1e25153a0f Merge branch 'hotfix/v1.61' 2017-03-12 23:22:31 +01:00
Sander Roosendaal
88348e3109 removed #tasks.py# 2017-03-12 23:21:46 +01:00
Sander Roosendaal
a1023884bd bug fix in C2 upload 2017-03-12 23:21:18 +01:00
Sander Roosendaal
9bb1fb9d72 removed #tasks.py file 2017-03-12 22:36:26 +01:00
Sander Roosendaal
d8cf24e476 Merge tag 'v1.6' into develop
sensor fusion
2017-03-12 22:34:39 +01:00
Sander Roosendaal
d9e9fbcdcd Merge branch 'release/v1.6' 2017-03-12 22:34:23 +01:00
Sander Roosendaal
d670cdf0f7 Merge tag 'v1.55' into develop
fixed flex chart bug
2017-03-12 22:21:26 +01:00
Sander Roosendaal
a188e90d8d Merge branch 'hotfix/v1.55' 2017-03-12 22:19:06 +01:00
Sander Roosendaal
96cb7f4054 v1.55 2017-03-12 22:18:11 +01:00
Sander Roosendaal
245d6597c0 Merge branch 'feature/sensorfusion' into develop 2017-03-12 22:08:06 +01:00
Sander Roosendaal
b2ce05f348 Fusion Metrics form only shows metrics that are available 2017-03-12 10:54:19 +01:00
Sander Roosendaal
d9f59011b3 added buttons to fusion 2017-03-12 09:48:13 +01:00
Sander Roosendaal
1e5d0a0b83 strava import now time based 2017-03-09 23:47:24 +01:00
Sander Roosendaal
71bded30c0 strava import - some improvements 2017-03-09 23:17:39 +01:00
Sander Roosendaal
39b80b6716 data fusion now working ... 2017-03-09 17:56:48 +01:00
Sander Roosendaal
ba8c9dfddb Merge branch 'develop' into feature/sensorfusion 2017-03-09 15:50:08 +01:00
Sander Roosendaal
14ac9ffb42 Merge tag 'v1.54' into develop
bug fix strava access denied response
2017-03-09 15:33:50 +01:00
Sander Roosendaal
4d1863ac81 Merge branch 'hotfix/v1.54' 2017-03-09 15:33:23 +01:00
Sander Roosendaal
b712d54dcb added y axes for distance - multi compare 2017-03-09 13:58:45 +01:00
Sander Roosendaal
a98a9b1178 fixed strava import errors 2017-03-09 12:58:28 +01:00
Sander Roosendaal
0030787453 nothing 2017-03-09 12:39:07 +01:00
Sander Roosendaal
1dcfbb067c non working version 2017-03-09 12:38:37 +01:00
Sander Roosendaal
5be668ebf0 Merge branch 'develop' into feature/sensorfusion 2017-03-08 16:12:41 +01:00
Sander Roosendaal
870d9466e7 Merge tag 'v1.53' into develop
fix workoutstate in flexchart
2017-03-08 07:25:22 +01:00
Sander Roosendaal
350720029d Merge branch 'hotfix/v1.53' 2017-03-08 07:23:07 +01:00
Sander Roosendaal
1b65d18de4 added workstrokesonly fix flex chart datacleaning 2017-03-08 07:22:10 +01:00
Sander Roosendaal
433aa348a2 Merge branch 'develop' into feature/sensorfusion 2017-03-06 16:35:54 +01:00
Sander Roosendaal
d7977adb93 Merge tag 'editintervalnonetype' into develop
check for nonetype error
2017-03-06 16:35:28 +01:00
Sander Roosendaal
f654ef1c6d Merge branch 'hotfix/editintervalnonetype' 2017-03-06 16:35:08 +01:00
Sander Roosendaal
48391e4702 type error check 2017-03-06 16:34:17 +01:00
Sander Roosendaal
0480489519 initial nonfunct fusion form and view 2017-03-06 15:23:13 +01:00
Sander Roosendaal
4303227b34 Merge branch 'develop' into feature/sensorfusion 2017-03-04 22:24:35 +01:00
Sander Roosendaal
1ee63ccbb6 change 2017-03-04 22:24:06 +01:00
Sander Roosendaal
9d859ea22a Merge branch 'feature/effectivedrivelength' into develop 2017-03-04 20:28:39 +01:00
Sander Roosendaal
1b8e43b13c comparison chart 2017-03-04 20:27:00 +01:00
Sander Roosendaal
4ea452c2cb done comparison chart 2017-03-04 20:16:23 +01:00