Private
Public Access
1
0
Commit Graph

1474 Commits

Author SHA1 Message Date
Sander Roosendaal
4d02b9db3c Merge tag 'v3.38' into develop
removed intervals labels from grouping
2017-07-06 13:57:50 +02:00
Sander Roosendaal
14e523ed4f Merge branch 'hotfix/v3.38' 2017-07-06 13:57:23 +02:00
Sander Roosendaal
fd545d2ce7 removed intervals labels 2017-07-06 13:56:26 +02:00
Sander Roosendaal
61f5fe6bc5 Merge tag 'v3.37' into develop
bugfix
2017-07-06 13:49:33 +02:00
Sander Roosendaal
af9eb1934f Merge branch 'hotfix/v3.37' 2017-07-06 13:48:49 +02:00
Sander Roosendaal
7bace76230 bugfix groupby date strftime 2017-07-06 13:47:43 +02:00
Sander Roosendaal
13ac0b17da Merge tag 'v3.36' into develop
bugfix session options
2017-07-06 13:43:16 +02:00
Sander Roosendaal
952210756d Merge branch 'release/v3.36' 2017-07-06 13:41:59 +02:00
Sander Roosendaal
19d3f47230 added options error check 2017-07-06 13:40:19 +02:00
Sander Roosendaal
5b6be42f78 Merge tag 'v3.35' into develop
multi flex (experimental)
2017-07-06 13:35:32 +02:00
Sander Roosendaal
8c7ba0a561 Merge branch 'release/v3.35' 2017-07-06 13:34:11 +02:00
Sander Roosendaal
a18fac1e50 multi flex labels 2017-07-06 13:28:17 +02:00
Sander Roosendaal
7eacc17fd1 multi flex chart 2017-07-06 13:19:46 +02:00
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