Private
Public Access
1
0
Commit Graph

2284 Commits

Author SHA1 Message Date
Sander Roosendaal
7a2608f932 bug fix for update agegroup records if not specified sex 2018-01-20 10:09:47 +01:00
Sander Roosendaal
9fe4560e69 Merge tag 'v5.66' into develop
bugfix
2018-01-20 10:08:20 +01:00
Sander Roosendaal
1bef73d20e Merge branch 'hotfix/v5.66' 2018-01-20 10:07:40 +01:00
Sander Roosendaal
a5aa6d65f5 bug fix flex chart 2018-01-20 10:04:32 +01:00
Sander Roosendaal
e99191ab07 Merge tag 'v5.65' into develop
hotfix
2018-01-20 09:47:08 +01:00
Sander Roosendaal
637105c01f Merge branch 'hotfix/v5.65' 2018-01-20 09:46:28 +01:00
Sander Roosendaal
bc6d12ee29 replace nan with negative value 2018-01-20 09:43:38 +01:00
Sander Roosendaal
14b6a9d381 bug fix
do not save fitness metric if nan is the outcome
2018-01-20 09:38:21 +01:00
Sander Roosendaal
85c9f9b8bc Merge tag 'v5.64' into develop
bug fix
2018-01-19 18:06:59 +01:00
Sander Roosendaal
7409638264 Merge branch 'hotfix/v5.64' 2018-01-19 18:04:35 +01:00
Sander Roosendaal
4f4d568463 added **kwargs to c2 tasks 2018-01-19 18:01:39 +01:00
Sander Roosendaal
217f8d57f8 Merge tag 'v5.63' into develop
improved C2 import
2018-01-19 17:54:13 +01:00
Sander Roosendaal
bad4e04b96 Merge branch 'release/v5.63' 2018-01-19 17:52:54 +01:00
Sander Roosendaal
e0277da42a Merge branch 'feature/nostrokedataimport' into develop 2018-01-19 17:44:44 +01:00
Sander Roosendaal
f9ccdd696b saved views.py 2018-01-19 17:39:17 +01:00
Sander Roosendaal
e5b92cd514 import without stroke data now works 2018-01-19 17:33:05 +01:00
Sander Roosendaal
45703f4946 imports no stroke data by creating synthetic workout 2018-01-19 16:54:55 +01:00
Sander Roosendaal
0d1be41e6e c2stuff.create_async_workout start
works but is not async yet
2018-01-19 13:14:23 +01:00
Sander Roosendaal
8e6460eb06 removes temporary records in powertimefitnessmetric 2018-01-19 08:34:58 +01:00
Sander Roosendaal
eea9efce2b Merge tag 'v5.62' into develop
bug fix
2018-01-17 22:45:07 +01:00
Sander Roosendaal
61c2565b2e Merge branch 'release/v5.62' 2018-01-17 22:43:51 +01:00
Sander Roosendaal
3772ddc0a0 bug fix 2018-01-17 22:37:23 +01:00
Sander Roosendaal
3f734979a1 Merge tag 'v5.61' into develop
bug fix
2018-01-17 22:25:10 +01:00
Sander Roosendaal
e4bf935019 Merge branch 'release/v5.61' 2018-01-17 22:23:59 +01:00
Sander Roosendaal
95fd2dcde0 bugfix 2018-01-17 22:14:33 +01:00
Sander Roosendaal
b6d0ab3587 Merge tag 'v5.6' into develop
adding fitness metric
2018-01-17 21:42:57 +01:00
Sander Roosendaal
762ce137df Merge branch 'release/v5.6' 2018-01-17 21:41:23 +01:00
Sander Roosendaal
3c70e241ad Merge branch 'feature/powertimefitnessmetric' into develop 2018-01-17 21:33:18 +01:00
Sander Roosendaal
eb6625845f fixing bug
middleware not working when user not logged in
2018-01-17 21:29:05 +01:00
Sander Roosendaal
5917e3c5b8 some tweaks to make middleware working 2018-01-17 18:39:02 +01:00
Sander Roosendaal
30a325d0f5 updatefitnessmetric as middleware 2018-01-17 18:27:59 +01:00
Sander Roosendaal
40813c4a0e db insertion through sql now working 2018-01-17 16:54:28 +01:00
Sander Roosendaal
fd88b8f375 added saving to db 2018-01-16 17:42:47 +01:00
Sander Roosendaal
dd48d66c3a first attempt 2018-01-16 17:04:30 +01:00
Sander Roosendaal
ed8c532884 added PowerTimeFitnessMetric model 2018-01-16 15:56:53 +01:00
Sander Roosendaal
8a916a4436 Merge branch 'feature/ranking' into develop 2018-01-16 15:43:58 +01:00
Sander Roosendaal
e2a1511c92 Merge branch 'develop' into feature/ranking 2018-01-16 15:36:55 +01:00
Sander Roosendaal
da4f2e32dc fixed unicodedecode error in workout split 2018-01-16 15:29:25 +01:00
Sander Roosendaal
5c0eeca049 Merge tag 'v5.54' into develop
hotfix
2018-01-14 20:40:40 +01:00
Sander Roosendaal
9f9b524367 Merge branch 'hotfix/v5.54' 2018-01-14 20:38:58 +01:00
Sander Roosendaal
29612adc8b small bugfix index in dataprep 2018-01-14 20:33:25 +01:00
Sander Roosendaal
6a5406af83 Merge tag 'v5.53' into develop
bug fix
2018-01-12 19:55:43 +01:00
Sander Roosendaal
9ab939f969 Merge branch 'hotfix/v5.53' 2018-01-12 19:53:55 +01:00
Sander Roosendaal
cad6277ddc typo in remove_asynctask 2018-01-12 19:51:08 +01:00
Sander Roosendaal
e560683dc7 Merge tag 'v5.52' into develop
hotfix
2018-01-12 19:34:48 +01:00
Sander Roosendaal
3b4e171dbd Merge branch 'hotfix/v5.52' 2018-01-12 19:34:08 +01:00
Sander Roosendaal
848c82b3fd hotfix define success in cp plot 2018-01-12 19:26:52 +01:00
Sander Roosendaal
7d68021ddc Merge tag 'v5.51' into develop
bug fix
2018-01-12 10:49:33 +01:00
Sander Roosendaal
64a5d89291 Merge branch 'hotfix/v5.51' 2018-01-12 10:47:54 +01:00
Sander Roosendaal
ebbbe6f68a bug fix in otw ranking 2.0 2018-01-12 10:45:49 +01:00