Private
Public Access
1
0
Commit Graph

803 Commits

Author SHA1 Message Date
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
Sander Roosendaal
6a7f112c2e Merge tag 'v1.41' into develop
error checking around interval edit save
2017-02-28 16:58:52 +01:00
Sander Roosendaal
60568b756f Merge branch 'hotfix/v1.41' 2017-02-28 16:57:44 +01:00
Sander Roosendaal
39f8ad1c77 error checking around notes saved with interval editor 2017-02-28 16:56:37 +01:00
Sander Roosendaal
56b520524c Merge tag 'v1.4' into develop
empower plots
2017-02-28 16:46:01 +01:00
Sander Roosendaal
889f0f19cd Merge branch 'release/v1.4' 2017-02-28 16:45:45 +01:00
Sander Roosendaal
d6e0e84960 empower plots 2017-02-28 16:38:41 +01:00
Sander Roosendaal
7ef66caec8 Merge tag 'v1.3' into develop
v1.3
2017-02-28 13:37:24 +01:00
Sander Roosendaal
3176b116fe Merge branch 'release/v1.3' 2017-02-28 13:37:09 +01:00
Sander Roosendaal
34b2a9335b advanced data filtering 2017-02-28 13:28:11 +01:00
Sander Roosendaal
b9d0088e55 Merge branch 'develop' into feature/sensorfusion 2017-02-27 14:18:26 +01:00
Sander Roosendaal
59b4dc4333 added check for file length 2017-02-27 14:11:55 +01:00
Sander Roosendaal
0ee6aa67d0 Merge tag 'v1.29' into develop
v1.29
2017-02-26 20:10:17 +01:00
Sander Roosendaal
4889043b96 Merge branch 'hotfix/v1.29' 2017-02-26 20:09:44 +01:00
Sander Roosendaal
afe3d132b5 v1.29 2017-02-26 20:08:16 +01:00
Sander Roosendaal
a8d2827fd7 Merge tag 'v1.28' into develop
v1.28
2017-02-26 20:01:33 +01:00
Sander Roosendaal
4d92160f7b Merge branch 'hotfix/v1.28' 2017-02-26 20:00:48 +01:00
Sander Roosendaal
db0eadc7c0 v1.28 2017-02-26 19:59:36 +01:00
Sander Roosendaal
cbd038a9a0 Merge tag 'v1.27' into develop
v1.27
2017-02-26 19:55:40 +01:00
Sander Roosendaal
6514f2f08a Merge branch 'hotfix/v1.27' 2017-02-26 19:55:09 +01:00
Sander Roosendaal
0e26631cb5 v1.27 2017-02-26 19:53:53 +01:00
Sander Roosendaal
e17202ff8e Merge tag 'v1.26' into develop
v1.26
2017-02-26 19:50:08 +01:00
Sander Roosendaal
95f5ceb2d0 Merge branch 'hotfix/v1.26' 2017-02-26 19:46:49 +01:00
Sander Roosendaal
15f91eff88 write response to error file 2017-02-26 19:45:55 +01:00
Sander Roosendaal
8dc72edbce Merge tag 'c2response' into develop
v1.25
2017-02-26 19:31:07 +01:00