Sander Roosendaal
|
5cbd0b310c
|
Merge branch 'hotfix/v6.44'
|
2018-04-20 11:34:19 +02:00 |
|
Sander Roosendaal
|
d86fc20870
|
bugfix - for workouts lacking time
|
2018-04-20 11:32:34 +02:00 |
|
Sander Roosendaal
|
247affe610
|
Merge branch 'hotfix/v6.43'
|
2018-04-20 11:21:21 +02:00 |
|
Sander Roosendaal
|
feeaf942d3
|
fixing error
|
2018-04-20 11:10:05 +02:00 |
|
Sander Roosendaal
|
fd42a5fe36
|
Merge branch 'hotfix/v6.42'
|
2018-04-16 07:58:42 +02:00 |
|
Sander Roosendaal
|
496c1efd5b
|
hotfix OTW CP chart
|
2018-04-16 07:45:24 +02:00 |
|
Sander Roosendaal
|
8636e7032e
|
Merge branch 'hotfix/cumstats'
|
2018-04-15 14:46:03 +02:00 |
|
Sander Roosendaal
|
13a673b7c3
|
bug fix
|
2018-04-15 14:45:17 +02:00 |
|
Sander Roosendaal
|
f614b17632
|
Merge branch 'hotfix/v6.41'
|
2018-04-09 18:28:25 +02:00 |
|
Sander Roosendaal
|
7edefc2373
|
hotfix hrftp
|
2018-04-09 18:27:25 +02:00 |
|
Sander Roosendaal
|
b084b65ad5
|
Merge branch 'release/v6.40'
|
2018-04-09 16:08:19 +02:00 |
|
Sander Roosendaal
|
d6c9f04b73
|
adding hrftp
|
2018-04-09 16:04:47 +02:00 |
|
Sander Roosendaal
|
c4b10e5b0b
|
Merge branch 'feature/dropdowns' into develop
|
2018-04-09 15:36:05 +02:00 |
|
Sander Roosendaal
|
2f6ec2472e
|
threw out a few metrics
|
2018-04-09 15:35:12 +02:00 |
|
Sander Roosendaal
|
0372acbaec
|
alternative layout of flex chart drop downs
|
2018-04-09 15:12:23 +02:00 |
|
Sander Roosendaal
|
d648aff2a8
|
Merge tag 'v6.39' into develop
fitness metrics lab & HRTSS
|
2018-04-09 14:36:50 +02:00 |
|
Sander Roosendaal
|
0d138a55c1
|
Merge branch 'release/v6.39'
|
2018-04-09 14:34:32 +02:00 |
|
Sander Roosendaal
|
0d40227ac4
|
added lab
|
2018-04-09 13:48:45 +02:00 |
|
Sander Roosendaal
|
c2636225f5
|
Merge branch 'feature/fitnessprogress' into develop
|
2018-04-09 13:43:17 +02:00 |
|
Sander Roosendaal
|
4ad1787a1d
|
date form for fitness metric
|
2018-04-09 13:42:25 +02:00 |
|
Sander Roosendaal
|
b3eed722d6
|
linear interpolation in fitnessmetric chart
|
2018-04-09 13:19:19 +02:00 |
|
Sander Roosendaal
|
f3ecaab599
|
added hrScore to stats and plannedsessions
in plannedsessions, if rScore = 0, taking hrScore
|
2018-04-09 10:30:55 +02:00 |
|
Sander Roosendaal
|
f8fcc83e6d
|
changes
|
2018-04-08 17:17:25 +02:00 |
|
Sander Roosendaal
|
1dce1cbfcb
|
prototype fitness-progress chart
|
2018-04-08 14:23:23 +02:00 |
|
Sander Roosendaal
|
3ec4494342
|
Merge tag 'v6.38' into develop
new interval parser
|
2018-04-07 15:25:56 +02:00 |
|
Sander Roosendaal
|
7173035b39
|
Merge branch 'release/v6.38'
|
2018-04-07 15:25:43 +02:00 |
|
Sander Roosendaal
|
8de1d4465f
|
new interval parser
|
2018-04-06 23:47:30 +02:00 |
|
Sander Roosendaal
|
871ed427a6
|
added RP3 ref & id to the nonmetric list
|
2018-04-06 14:04:54 +02:00 |
|
Sander Roosendaal
|
328f98393a
|
Merge tag 'v6.37' into develop
release instroke
|
2018-04-06 12:41:27 +02:00 |
|
Sander Roosendaal
|
1cc62c75fc
|
Merge branch 'release/v6.37'
|
2018-04-06 12:39:40 +02:00 |
|
Sander Roosendaal
|
30d23608cc
|
in stroke extra metrics (diff, minpos, maxpos)
|
2018-04-06 10:56:48 +02:00 |
|
Sander Roosendaal
|
d38e5cd813
|
box chart now uses StatsOptionsForm
|
2018-04-05 15:41:47 +02:00 |
|
Sander Roosendaal
|
d1c4255d40
|
iremoved a few extra metrics
generated by rowingphysics - dont need to be on flex chart
|
2018-04-05 12:33:48 +02:00 |
|
Sander Roosendaal
|
3d9ee2aa22
|
added ascii utf filter to messages around comments
|
2018-04-04 17:32:18 +02:00 |
|
Sander Roosendaal
|
1ce5ba2a17
|
no change
|
2018-04-03 14:59:45 +02:00 |
|
Sander Roosendaal
|
a9ec2316d9
|
Merge tag 'v6.36' into develop
oauth improvements & rower names
|
2018-04-02 09:40:17 +02:00 |
|
Sander Roosendaal
|
48aa7da798
|
Merge branch 'release/v6.36'
|
2018-04-02 09:36:45 +02:00 |
|
Sander Roosendaal
|
d6c471d0e0
|
change rower replaced with name
|
2018-04-01 20:15:52 +02:00 |
|
Sander Roosendaal
|
f479d7438b
|
Merge branch 'feature/oauth' into develop
|
2018-03-31 07:03:21 -07:00 |
|
Sander Roosendaal
|
692883b8e0
|
host names on developers.html
|
2018-03-31 07:01:45 -07:00 |
|
Sander Roosendaal
|
bfe6fc3111
|
slight update of developers.html
|
2018-03-31 06:54:26 -07:00 |
|
Sander Roosendaal
|
7fd376b8f8
|
Merge branch 'feature/nkoauth' into develop
|
2018-03-30 16:10:29 -07:00 |
|
Sander Roosendaal
|
8c4b4cce73
|
updated developers.html
|
2018-03-30 16:09:36 -07:00 |
|
Sander Roosendaal
|
ff15f6e2f7
|
small change
|
2018-03-30 16:03:42 -07:00 |
|
Sander Roosendaal
|
f711bd8214
|
added NK EMpower parameters to api strokedata
|
2018-03-29 18:24:13 -07:00 |
|
Sander Roosendaal
|
867706a6ca
|
Merge branch 'bugfix/coachview' into develop
|
2018-03-29 18:10:42 -07:00 |
|
Sander Roosendaal
|
73148c858e
|
Merge tag 'v6.35' into develop
fix underarmour sync error
|
2018-03-29 17:36:34 -07:00 |
|
Sander Roosendaal
|
d0c11a5c22
|
Merge branch 'release/v6.35'
|
2018-03-29 17:34:40 -07:00 |
|
Sander Roosendaal
|
0ed6a4c9e1
|
removed redundant file
|
2018-03-29 17:05:33 -07:00 |
|
Sander Roosendaal
|
5e8d639ef2
|
Merge tag 'uaupload' into develop
bug fix in token refresh under armour
|
2018-03-29 17:05:15 -07:00 |
|