Private
Public Access
1
0
Commit Graph

2324 Commits

Author SHA1 Message Date
Sander Roosendaal
f47130c071 Merge tag 'v5.77' into develop
replacing gifs
2018-02-06 08:23:58 +01:00
Sander Roosendaal
0490278fbf Merge branch 'hotfix/v5.77' 2018-02-06 08:21:56 +01:00
Sander Roosendaal
8045931b75 updated rowingtimer.gif 2018-02-06 08:20:55 +01:00
Sander Roosendaal
1fe1d08aa9 replaced all with rowing timers 2018-02-06 08:20:19 +01:00
Sander Roosendaal
e7f053b9de Merge tag 'v5.76' into develop
unfinished
2018-02-05 19:38:30 +01:00
Sander Roosendaal
77693ddf9e Merge branch 'hotfix/v5.76' 2018-02-05 19:35:05 +01:00
Sander Roosendaal
ad07cdbe7e initial replacement of gif 2018-02-05 19:32:05 +01:00
Sander Roosendaal
4c38b27ae6 Merge tag 'v5.75' into develop
bug fix
2018-02-05 10:10:51 +01:00
Sander Roosendaal
c704bf1988 Merge branch 'hotfix/v5.75' 2018-02-05 10:10:24 +01:00
Sander Roosendaal
b9e3e482e5 bug fix 2018-02-05 10:09:10 +01:00
Sander Roosendaal
66f1baf258 Merge tag 'v5.74' into develop
hotfix
2018-01-24 18:46:59 +01:00
Sander Roosendaal
e7890a4e54 Merge branch 'hotfix/v5.74' 2018-01-24 18:45:07 +01:00
Sander Roosendaal
a014605deb hotfix get_job_status 2018-01-24 18:43:50 +01:00
Sander Roosendaal
865d7837f9 changed order - rotating resized image 2018-01-23 22:07:54 +01:00
Sander Roosendaal
2f6ccd3891 removed temporary file 2018-01-23 21:28:50 +01:00
Sander Roosendaal
fe8fb9e867 Merge tag 'v5.73' into develop
image rotation according to exif
2018-01-23 21:27:39 +01:00
Sander Roosendaal
fbff6d96ce Merge branch 'release/v5.73' 2018-01-23 21:26:38 +01:00
Sander Roosendaal
ef47a42272 Merge branch 'feature/rotate' into develop 2018-01-23 21:25:00 +01:00
Sander Roosendaal
f313f4ce47 removed temp files 2018-01-23 21:23:37 +01:00
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