Private
Public Access
1
0
Commit Graph

827 Commits

Author SHA1 Message Date
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
Sander Roosendaal
82efd308ba flex chart - need to do comparison chart 2017-03-04 15:08:01 +01:00
Sander Roosendaal
5e5cc36da0 added effective drive length 2017-03-03 15:41:51 +01:00
Sander Roosendaal
1bdd049948 Merge tag 'v1.52' into develop
back link to workout page on charts
2017-03-03 08:38:20 +01:00
Sander Roosendaal
46be19861d Merge branch 'release/v1.52' 2017-03-03 08:37:30 +01:00
Sander Roosendaal
12ecd3d4e9 added link back to workout on graph page 2017-03-03 08:23:05 +01:00
Sander Roosendaal
866a4123b4 images on comment page 2017-03-02 20:52:10 +01:00
Sander Roosendaal
2f1db232cc Merge tag 'v1.51' into develop
work per stroke slider
2017-03-02 16:32:34 +01:00
Sander Roosendaal
bd7ff9d2e1 Merge branch 'release/v1.51' 2017-03-02 16:31:59 +01:00
Sander Roosendaal
4368058c34 Merge branch 'feature/workperstrokeslider' into develop 2017-03-02 14:54:38 +01:00
Sander Roosendaal
992224731f flex chart work per stroke slider 2017-03-02 14:53:18 +01:00
Sander Roosendaal
8134d76a07 work per stroke slider on flex chart 2017-03-02 11:32:53 +01:00
Sander Roosendaal
c37461f411 Merge tag 'v1.5' into develop
adding inboard & oarlength
2017-03-01 18:54:36 +01:00
Sander Roosendaal
e78effb714 Merge branch 'release/v1.5' 2017-03-01 18:53:04 +01:00
Sander Roosendaal
24ad10d1a8 Merge branch 'feature/empower3' into develop 2017-03-01 15:42:39 +01:00
Sander Roosendaal
82c182f657 improved empower calculation of drive length 2017-03-01 15:40:16 +01:00
Sander Roosendaal
9bf485f596 adding oarlength and inboard 2017-03-01 15:00:58 +01:00
Sander Roosendaal
7f4d64450b Merge tag 'v1.42' into develop
check: for empty dataframe in empower force plot
2017-03-01 12:12:25 +01:00
Sander Roosendaal
d4fbe7d3fb Merge branch 'hotfix/v1.42' 2017-03-01 12:05:58 +01:00
Sander Roosendaal
ae854037f2 added check if dataframe is not empty to Empower force curve 2017-03-01 12:04:44 +01:00
Sander Roosendaal
ea53e181ec Merge branch 'develop' into feature/sensorfusion 2017-02-28 17:05:10 +01:00