Private
Public Access
1
0
Commit Graph

2305 Commits

Author SHA1 Message Date
Sander Roosendaal
58cdff8d0b fixed EXIF rotations 2018-01-23 21:22:44 +01:00
Sander Roosendaal
28729c37d4 bug fix 2018-01-23 15:43:06 +01:00
Sander Roosendaal
a72cfc78c4 Merge tag 'v5.72' into develop
bug fix
2018-01-23 15:33:19 +01:00
Sander Roosendaal
9f4747dd49 Merge branch 'release/v5.72' 2018-01-23 15:32:21 +01:00
Sander Roosendaal
064a36b112 Merge tag 'v5.71' into develop
photo attach option
2018-01-23 15:25:18 +01:00
Sander Roosendaal
4c2c05c707 Merge branch 'release/v5.71' 2018-01-23 15:24:57 +01:00
Sander Roosendaal
80f068c995 Merge branch 'feature/imgur' into develop 2018-01-23 15:11:03 +01:00
Sander Roosendaal
ed56a4179a added image attach buttons to edit and workflow 2018-01-23 15:10:17 +01:00
Sander Roosendaal
22cba46f3b image upload working 2018-01-23 14:37:52 +01:00
Sander Roosendaal
983b3be86c restricted allowable static images to 6 2018-01-23 12:09:41 +01:00
Sander Roosendaal
585b48cdf6 Merge tag 'v5.70' into develop
bug fix
2018-01-23 08:45:20 +01:00
Sander Roosendaal
9557d62101 Merge branch 'hotfix/v5.70' 2018-01-23 08:45:07 +01:00
Sander Roosendaal
05cde74e3d bug fix timezone c2 import 2018-01-23 08:41:52 +01:00
Sander Roosendaal
9ae0f72c0f Merge tag 'v5.69' into develop
bug fix time zone
2018-01-21 13:32:58 +01:00
Sander Roosendaal
8cb5061b38 Merge branch 'hotfix/v5.69' 2018-01-21 13:26:40 +01:00
Sander Roosendaal
e215f1a170 timezone bug fix 2018-01-21 13:22:47 +01:00
Sander Roosendaal
5f2ef40cc8 Merge tag 'v5.68' into develop
bug fixes
2018-01-20 10:33:52 +01:00
Sander Roosendaal
cc6726e76a Merge branch 'hotfix/v5.68' 2018-01-20 10:29:17 +01:00
Sander Roosendaal
60a81e68fe bug fixes for non specified gender 2018-01-20 10:25:34 +01:00
Sander Roosendaal
5b635d9003 Merge tag 'v5.67' into develop
bug fixes
2018-01-20 10:15:48 +01:00
Sander Roosendaal
e327b2b16a Merge branch 'release/v5.67' 2018-01-20 10:14:49 +01:00
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