Private
Public Access
1
0
Commit Graph

1461 Commits

Author SHA1 Message Date
Sander Roosendaal
cde3eaf605 start of multiflex 2017-07-06 09:57:20 +02:00
Sander Roosendaal
b26f7df373 bug checking box plot select older workouts 2017-07-06 09:37:45 +02:00
Sander Roosendaal
d3b864241f Merge tag 'v3.34' into develop
toggle all checkboxes
2017-07-05 18:39:18 +02:00
Sander Roosendaal
af8ac5763e Merge branch 'release/v3.34' 2017-07-05 18:37:50 +02:00
Sander Roosendaal
f49cda8c25 Merge branch 'feature/selectall' into develop 2017-07-05 17:10:59 +02:00
Sander Roosendaal
895f47e32d select on name not type (checkbox toggle) 2017-07-05 17:09:59 +02:00
Sander Roosendaal
d06bc92180 toggle multiple check boxes 2017-07-05 17:07:16 +02:00
Sander Roosendaal
96aeb88c1f Merge tag 'v3.33' into develop
breakthrough notification bug fixes
2017-07-05 11:42:33 +02:00
Sander Roosendaal
9f2f3fda43 Merge branch 'release/v3.33' 2017-07-05 11:42:11 +02:00
Sander Roosendaal
ffacb329cc Merge branch 'bugfix/mikesbreakthrough' into develop 2017-07-05 11:28:01 +02:00
Sander Roosendaal
c75a169229 finding source of unnecessary notifications 2017-07-04 22:26:44 +02:00
Sander Roosendaal
145cef8f52 Merge tag 'v3.32' into develop
hotfix ote-bests
2017-07-04 20:41:21 +02:00
Sander Roosendaal
c02176629c Merge branch 'hotfix/v3.32' 2017-07-04 20:40:32 +02:00
Sander Roosendaal
27ae608666 hotfix 2017-07-04 20:39:45 +02:00
Sander Roosendaal
6b5904ecf7 some bug fixes 2017-07-04 20:29:17 +02:00
Sander Roosendaal
1fb7b99a7b Merge tag 'v3.31' into develop
fixed coastal export and flexall/cumflex bugs
2017-07-04 10:23:30 +02:00
Sander Roosendaal
ed49a1f995 Merge branch 'hotfix/v3.31' 2017-07-04 10:23:09 +02:00
Sander Roosendaal
43717c874d fixed c2 export error for coastal 2017-07-04 10:15:40 +02:00
Sander Roosendaal
c908d2c21e added coastal to stats options form 2017-07-04 10:05:40 +02:00
Sander Roosendaal
a8fa64ca5a Merge tag 'v3.30' into develop
notifications
2017-07-03 22:17:34 +02:00
Sander Roosendaal
4dd71f7b93 Merge branch 'release/v3.30' 2017-07-03 22:17:10 +02:00
Sander Roosendaal
0333db9f27 v number 2017-07-03 22:16:09 +02:00
Sander Roosendaal
92d1a6d966 Merge branch 'feature/cpnotification' into develop 2017-07-03 22:09:25 +02:00
Sander Roosendaal
cfd6c1da7a values in CP notification email 2017-07-03 22:07:07 +02:00
Sander Roosendaal
4f832235f6 added delta values to breakthrough email 2017-07-03 20:49:54 +02:00
Sander Roosendaal
5863b1a1f2 Merge tag 'v3.29' into develop
making coastal behave as water
2017-07-03 16:26:51 +02:00
Sander Roosendaal
fb23df5d38 Merge branch 'hotfix/v3.29' 2017-07-03 16:25:43 +02:00
Sander Roosendaal
3aa567d10e coastal to behave as water 2017-07-03 16:24:47 +02:00
Sander Roosendaal
f4024a5acd Merge tag 'v3.28' into develop
coastal workouttype + sticky workouttype
2017-07-03 15:57:52 +02:00
Sander Roosendaal
8e33b78de1 Merge branch 'release/v3.28' 2017-07-03 15:56:45 +02:00
Sander Roosendaal
cef4a6e818 added coastal as type, made workouttype sticky 2017-07-03 15:50:10 +02:00
Sander Roosendaal
e1b468d4da added new landing page image 2017-07-03 12:22:03 +02:00
Sander Roosendaal
a5bedb4a93 logging of API usage 2017-07-03 12:03:36 +02:00
Sander Roosendaal
e69239f2e3 Merge tag 'v3.27' into develop
fixes on CP chart
2017-06-29 20:12:07 +02:00
Sander Roosendaal
c558c14e71 Merge branch 'release/v3.27' 2017-06-29 20:11:43 +02:00
Sander Roosendaal
30bc734c0c removed some conditions CP 2017-06-29 20:04:04 +02:00
Sander Roosendaal
49a0670f79 Merge tag 'v3.26' into develop
bug fix
2017-06-29 16:25:43 +02:00
Sander Roosendaal
cf2c568a61 Merge branch 'release/v3.26' 2017-06-29 16:25:26 +02:00
Sander Roosendaal
ebf7eb9bd2 bug fix 2017-06-29 16:23:01 +02:00
Sander Roosendaal
4351c0fd64 Merge tag 'v3.25' into develop
bug fix divide zero
2017-06-29 16:10:25 +02:00
Sander Roosendaal
fd634e2605 Merge branch 'hotfix/v3.25' 2017-06-29 16:10:00 +02:00
Sander Roosendaal
64d32f838d bug fix divide zero 2017-06-29 16:09:04 +02:00
Sander Roosendaal
c6b05551b9 Merge tag 'v3.24' into develop
additional bug fix
2017-06-29 16:03:22 +02:00
Sander Roosendaal
6e14a8086d Merge branch 'hotfix/v3.24' 2017-06-29 16:03:01 +02:00
Sander Roosendaal
936da6f9f8 additional wmax condition 2017-06-29 16:02:02 +02:00
Sander Roosendaal
bd4bb0504a Merge tag 'v3.23' into develop
limit to 1 HP
2017-06-29 15:52:59 +02:00
Sander Roosendaal
0d7dd17d79 Merge branch 'hotfix/v3.23' 2017-06-29 15:52:40 +02:00
Sander Roosendaal
d422e009c5 upper limit CP chart to 1 Horse Power 2017-06-29 15:51:28 +02:00
Sander Roosendaal
53464ebe8e Merge tag 'v3.22' into develop
improved CP charts OTW
2017-06-29 15:44:31 +02:00
Sander Roosendaal
a7b6486dfd Merge branch 'release/v3.22' 2017-06-29 15:43:58 +02:00