Private
Public Access
1
0
Commit Graph

5215 Commits

Author SHA1 Message Date
Sander Roosendaal
2294603129 removing obsolete rowingdata(csvfile) 2019-11-11 17:31:56 +01:00
Sander Roosendaal
23909feabf deprecation warning solved 2019-11-11 17:26:32 +01:00
Sander Roosendaal
781d76d639 fixing workout charts 2019-11-11 15:22:41 +01:00
Sander Roosendaal
1edb9967fa Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall 2019-11-11 09:42:00 +01:00
Sander Roosendaal
dc425445b2 Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-11-11 09:41:28 +01:00
Sander Roosendaal
47dbb0f23c Merge tag 'v10.51' into develop
bug fix
2019-11-11 09:40:17 +01:00
Sander Roosendaal
f92cfb3f5e Merge branch 'release/v10.51' 2019-11-11 09:29:28 +01:00
Sander Roosendaal
6e149a696d bug fix 2019-11-11 09:07:46 +01:00
Sander Roosendaal
1c87210a57 simple gauge doing catch angle 2019-11-10 15:19:23 +01:00
Sander Roosendaal
1bc3638a96 added access to video analysis from analytics 2019-11-09 16:38:28 +01:00
Sander Roosendaal
ee24c5f394 Merge branch 'release/v10.50' 2019-11-09 15:21:36 +01:00
Sander Roosendaal
647547098d changed workflow (map bug) 2019-11-09 15:16:11 +01:00
Sander Roosendaal
b25a8aeb23 leaflet bug fix 2019-11-09 15:14:30 +01:00
Sander Roosendaal
fe3de18edc Merge branch 'release/v10.49' 2019-11-09 14:44:56 +01:00
Sander Roosendaal
394797fc80 foutje verbeterd 2019-11-09 14:43:06 +01:00
Sander Roosendaal
f05f596866 Merge branch 'develop' into feature/embeddedvideo 2019-11-08 15:50:43 +01:00
Sander Roosendaal
c6c7f85bb3 Merge tag 'v10.48' into develop
releasing bug fixes
2019-11-08 15:43:37 +01:00
Sander Roosendaal
7cefb6441d Merge branch 'release/v10.48' 2019-11-08 15:42:21 +01:00
Sander Roosendaal
9c985f5f82 small typo 2019-11-08 15:34:24 +01:00
Sander Roosendaal
de1dd33f4e bug fixes 2019-11-08 08:42:28 +01:00
Sander Roosendaal
d0ffdf94e7 redirecting if unique together not met 2019-11-07 18:18:14 +01:00
Sander Roosendaal
d588de2a42 minimal refactoring and unique together constraint 2019-11-07 18:04:21 +01:00
Sander Roosendaal
e35b3fd7b1 Added slider and improved behavior of video analysis 2019-11-07 17:55:02 +01:00
Sander Roosendaal
9703f981d1 Merge branch 'release/v10.47' 2019-11-06 18:38:30 +01:00
Sander Roosendaal
50ac712bc2 bug fix dataprepnodjango 2019-11-06 16:07:38 +01:00
Sander Roosendaal
8fdca8a1f6 VideoAnalysis object urls 2019-11-05 22:09:26 +01:00
Sander Roosendaal
0d48fae3cf small improvement coordinates 2019-11-05 20:40:15 +01:00
Sander Roosendaal
dc6c6f4d7a forms typo 2019-11-05 18:15:50 +01:00
Sander Roosendaal
4904db724f initial version of form working 2019-11-05 18:14:43 +01:00
Sander Roosendaal
ee69d6b537 Video ID from URL 2019-11-05 13:44:25 +01:00
Sander Roosendaal
c2a8a8a6c5 removed not useful data 2019-11-05 11:10:42 +01:00
Sander Roosendaal
c6030d4325 now working with json object - to prepare for future AJAX calls 2019-11-05 11:09:45 +01:00
Sander Roosendaal
7ef38de539 added map with moving marker 2019-11-05 10:37:14 +01:00
Sander Roosendaal
2468fcb909 Merge branch 'feature/embeddedvideo' of https://bitbucket.org/sanderroosendaal/rowsandall into feature/embeddedvideo 2019-11-05 07:53:40 +01:00
Sander Roosendaal
16d71a9d43 removed print statements 2019-11-04 22:18:20 +01:00
Sander Roosendaal
f92d6405cf proof of concept /video 2019-11-04 21:56:51 +01:00
Sander Roosendaal
89f607ec8b Merge tag 'hongkong' into develop
no changes - bug was in database
2019-11-04 08:48:23 +01:00
Sander Roosendaal
01ca362c87 nothing 2019-11-03 17:18:56 +01:00
Sander Roosendaal
0874746d1b nothjin 2019-11-03 17:18:27 +01:00
Sander Roosendaal
0466ca9ac7 improved testing 2019-11-03 17:01:29 +01:00
Sander Roosendaal
a7c565cef2 Merge branch 'release/v10.46' 2019-11-03 16:31:33 +01:00
Sander Roosendaal
64ce92732c bug fix count 2019-11-03 16:24:07 +01:00
Sander Roosendaal
b5f80d72aa removing trash 2019-11-03 10:14:21 +01:00
Sander Roosendaal
6e633c9562 Merge branch 'release/v10.45' 2019-11-03 10:12:19 +01:00
Sander Roosendaal
84fc9c42a6 Merge branch 'feature/forceunit' into develop 2019-11-03 10:11:46 +01:00
Sander Roosendaal
b9b83cca7e and one more tweak 2019-11-03 10:09:32 +01:00
Sander Roosendaal
0616419835 more tweaks for pytest 2019-11-03 10:06:29 +01:00
Sander Roosendaal
0468ebe54b getting pytest to work 2019-11-03 10:02:11 +01:00
Sander Roosendaal
c4642060a8 added test for Colin's file and fixed tests 2019-11-03 09:54:50 +01:00
Sander Roosendaal
38111908d6 passing colin's file 2019-11-03 09:38:16 +01:00