Private
Public Access
1
0

Commit Graph

  • 47dbb0f23c Merge tag 'v10.51' into develop Sander Roosendaal 2019-11-11 09:40:17 +01:00
  • f92cfb3f5e Merge branch 'release/v10.51' Sander Roosendaal 2019-11-11 09:29:28 +01:00
  • 6e149a696d bug fix Sander Roosendaal 2019-11-11 09:07:46 +01:00
  • 1c87210a57 simple gauge doing catch angle Sander Roosendaal 2019-11-10 15:19:23 +01:00
  • 1bc3638a96 added access to video analysis from analytics Sander Roosendaal 2019-11-09 16:38:28 +01:00
  • ee24c5f394 Merge branch 'release/v10.50' Sander Roosendaal 2019-11-09 15:21:36 +01:00
  • 647547098d changed workflow (map bug) Sander Roosendaal 2019-11-09 15:16:11 +01:00
  • b25a8aeb23 leaflet bug fix Sander Roosendaal 2019-11-09 15:14:30 +01:00
  • fe3de18edc Merge branch 'release/v10.49' Sander Roosendaal 2019-11-09 14:44:56 +01:00
  • 394797fc80 foutje verbeterd Sander Roosendaal 2019-11-09 14:43:06 +01:00
  • f05f596866 Merge branch 'develop' into feature/embeddedvideo Sander Roosendaal 2019-11-08 15:50:43 +01:00
  • c6c7f85bb3 Merge tag 'v10.48' into develop Sander Roosendaal 2019-11-08 15:43:37 +01:00
  • 7cefb6441d Merge branch 'release/v10.48' Sander Roosendaal 2019-11-08 15:42:21 +01:00
  • 9c985f5f82 small typo Sander Roosendaal 2019-11-08 15:34:24 +01:00
  • de1dd33f4e bug fixes Sander Roosendaal 2019-11-08 08:42:28 +01:00
  • d0ffdf94e7 redirecting if unique together not met Sander Roosendaal 2019-11-07 18:18:14 +01:00
  • d588de2a42 minimal refactoring and unique together constraint Sander Roosendaal 2019-11-07 18:04:21 +01:00
  • e35b3fd7b1 Added slider and improved behavior of video analysis Sander Roosendaal 2019-11-07 17:55:02 +01:00
  • 9703f981d1 Merge branch 'release/v10.47' Sander Roosendaal 2019-11-06 18:38:30 +01:00
  • 50ac712bc2 bug fix dataprepnodjango Sander Roosendaal 2019-11-06 16:07:38 +01:00
  • 8fdca8a1f6 VideoAnalysis object urls Sander Roosendaal 2019-11-05 22:09:26 +01:00
  • 0d48fae3cf small improvement coordinates Sander Roosendaal 2019-11-05 20:40:15 +01:00
  • dc6c6f4d7a forms typo Sander Roosendaal 2019-11-05 18:15:50 +01:00
  • 4904db724f initial version of form working Sander Roosendaal 2019-11-05 18:14:43 +01:00
  • ee69d6b537 Video ID from URL Sander Roosendaal 2019-11-05 13:44:25 +01:00
  • c2a8a8a6c5 removed not useful data Sander Roosendaal 2019-11-05 11:10:42 +01:00
  • c6030d4325 now working with json object - to prepare for future AJAX calls Sander Roosendaal 2019-11-05 11:09:45 +01:00
  • 7ef38de539 added map with moving marker Sander Roosendaal 2019-11-05 10:37:14 +01:00
  • 2468fcb909 Merge branch 'feature/embeddedvideo' of https://bitbucket.org/sanderroosendaal/rowsandall into feature/embeddedvideo Sander Roosendaal 2019-11-05 07:53:40 +01:00
  • 16d71a9d43 removed print statements Sander Roosendaal 2019-11-04 22:18:20 +01:00
  • f92d6405cf proof of concept /video Sander Roosendaal 2019-11-04 21:56:51 +01:00
  • 89f607ec8b Merge tag 'hongkong' into develop Sander Roosendaal 2019-11-04 08:48:23 +01:00
  • 01ca362c87 nothing Sander Roosendaal 2019-11-03 17:18:56 +01:00
  • 0874746d1b nothjin Sander Roosendaal 2019-11-03 17:18:27 +01:00
  • 0466ca9ac7 improved testing Sander Roosendaal 2019-11-03 17:01:29 +01:00
  • a7c565cef2 Merge branch 'release/v10.46' Sander Roosendaal 2019-11-03 16:31:33 +01:00
  • 64ce92732c bug fix count Sander Roosendaal 2019-11-03 16:24:07 +01:00
  • b5f80d72aa removing trash Sander Roosendaal 2019-11-03 10:14:21 +01:00
  • 6e633c9562 Merge branch 'release/v10.45' Sander Roosendaal 2019-11-03 10:12:19 +01:00
  • 84fc9c42a6 Merge branch 'feature/forceunit' into develop Sander Roosendaal 2019-11-03 10:11:46 +01:00
  • b9b83cca7e and one more tweak Sander Roosendaal 2019-11-03 10:09:32 +01:00
  • 0616419835 more tweaks for pytest Sander Roosendaal 2019-11-03 10:06:29 +01:00
  • 0468ebe54b getting pytest to work Sander Roosendaal 2019-11-03 10:02:11 +01:00
  • c4642060a8 added test for Colin's file and fixed tests Sander Roosendaal 2019-11-03 09:54:50 +01:00
  • 38111908d6 passing colin's file Sander Roosendaal 2019-11-03 09:38:16 +01:00
  • 82f8278df9 added test for existing files Sander Roosendaal 2019-11-01 20:27:37 +01:00
  • 31302e5c81 typo correction, not tested Sander Roosendaal 2019-11-01 17:57:56 +01:00
  • 84614fc931 last change in force unit testing Sander Roosendaal 2019-11-01 17:56:37 +01:00
  • 48881046df tests should now pass Sander Roosendaal 2019-11-01 17:55:22 +01:00
  • 67607e02b8 adding test for NK SpeedCoach Empower Sander Roosendaal 2019-11-01 17:37:36 +01:00
  • 1f43e5e28b adding unit test on force units Sander Roosendaal 2019-11-01 16:08:48 +01:00
  • 6fa6cc92e9 lbs to N misery Sander Roosendaal 2019-10-31 22:27:23 +01:00
  • f5dd1f370c tried to spede up workouts_view Sander Roosendaal 2019-10-31 21:20:44 +01:00
  • 474749371e Merge branch 'feature/speed' into develop Sander Roosendaal 2019-10-31 21:03:22 +01:00
  • 52c2879097 edit view should be a bit faster Sander Roosendaal 2019-10-31 20:58:58 +01:00
  • cd6c09e013 avoiding csv write if not necessary workout edit view Sander Roosendaal 2019-10-31 20:34:15 +01:00
  • dd8a4955d8 bug fix Sander Roosendaal 2019-10-31 19:22:09 +01:00
  • df80860ed1 replaced len with count() on a few queries Sander Roosendaal 2019-10-31 18:32:58 +01:00
  • 9d6eabca19 Merge branch 'release/v10.44' into develop Sander Roosendaal 2019-10-31 17:28:20 +01:00
  • f9d751589e Merge branch 'release/v10.44' Sander Roosendaal 2019-10-31 17:28:04 +01:00
  • 0622a08536 bug fix Sander Roosendaal 2019-10-31 17:27:54 +01:00
  • f183579237 improved data cleaning Sander Roosendaal 2019-10-31 17:17:03 +01:00
  • f0a2100bb8 Merge branch 'release/v10.43' into develop Sander Roosendaal 2019-10-31 16:02:42 +01:00
  • 2c8a3be795 Merge branch 'release/v10.43' Sander Roosendaal 2019-10-31 16:02:33 +01:00
  • 4bf967195f corrected incorrect tabs Sander Roosendaal 2019-10-31 16:01:10 +01:00
  • 76b757f19b bug fix Sander Roosendaal 2019-10-31 15:51:13 +01:00
  • 473f2b3cdf small bug fixes Sander Roosendaal 2019-10-31 15:46:25 +01:00
  • 3f0f8e69b0 changes Sander Roosendaal 2019-10-31 15:19:30 +01:00
  • a9316d6f21 adding stroke count Sander Roosendaal 2019-10-31 15:17:18 +01:00
  • 09b57b930c Merge branch 'release/v10.42' Sander Roosendaal 2019-10-31 15:15:35 +01:00
  • 37024296c0 solves #505 Sander Roosendaal 2019-10-31 15:09:05 +01:00
  • 8252e7a9b2 Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop Sander Roosendaal 2019-10-31 14:55:23 +01:00
  • 550579d02f Merge branch 'feature/c2intervals' into develop Sander Roosendaal 2019-10-31 11:46:45 +01:00
  • d4f311c612 adding splits to C2 workout export Sander Roosendaal 2019-10-31 11:45:44 +01:00
  • 102efa2cf2 fixed error in parquet Sander Roosendaal 2019-10-31 07:59:07 +01:00
  • ec10a6b96b Merge tag 'models' into develop Sander Roosendaal 2019-10-29 14:27:20 +01:00
  • 469fbc166a Merge branch 'hotfix/models' Sander Roosendaal 2019-10-29 14:26:38 +01:00
  • 8e0173f7d8 undelete altered lines in models.py Sander Roosendaal 2019-10-29 14:15:07 +01:00
  • eb37da782d bug fix Sander Roosendaal 2019-10-29 14:05:35 +01:00
  • a915257072 Merge tag 'v10.41' into develop Sander Roosendaal 2019-10-29 09:51:42 +01:00
  • 0ada6f2a57 Merge branch 'release/v10.41' Sander Roosendaal 2019-10-29 09:51:10 +01:00
  • 4fb8694dcb Bug fix Sander Roosendaal 2019-10-29 09:42:12 +01:00
  • e55c42f930 trivial changes white space Sander Roosendaal 2019-10-24 20:51:22 +02:00
  • d9db459b07 Merge tag 'v10.40' into develop Sander Roosendaal 2019-10-24 09:04:53 +02:00
  • 4ccdbeff58 Merge branch 'release/v10.40' Sander Roosendaal 2019-10-24 09:03:58 +02:00
  • effb8cc7a7 Merge branch 'feature/dask' into develop Sander Roosendaal 2019-10-24 08:17:25 +02:00
  • ff5a8a7d3e restored strokedata temporarily Sander Roosendaal 2019-10-24 08:16:28 +02:00
  • 2099dde846 bug fixes Sander Roosendaal 2019-10-23 21:25:47 +02:00
  • 8398701320 moving age group records to c2stuff Sander Roosendaal 2019-10-23 20:34:16 +02:00
  • 7a26669cd7 removed StrokeData table and all references to it Sander Roosendaal 2019-10-23 20:17:49 +02:00
  • c0e8e448e3 updated dataprepnodjango Sander Roosendaal 2019-10-23 20:04:28 +02:00
  • fa373d781f ds Sander Roosendaal 2019-10-23 18:15:07 +02:00
  • 4ea24fa5aa small improvements dataprep Sander Roosendaal 2019-10-23 06:48:58 +02:00
  • 8e2f7b0cce updates in nodjango Sander Roosendaal 2019-10-22 22:02:45 +02:00
  • 450a32221f removed temp file Sander Roosendaal 2019-10-22 21:58:39 +02:00
  • 08c135c6cd testing Sander Roosendaal 2019-10-22 21:58:09 +02:00
  • 622ae44ea6 using dask Sander Roosendaal 2019-10-22 21:40:35 +02:00
  • 7f2c68a903 bla Sander Roosendaal 2019-10-22 21:34:03 +02:00
  • 6de6a0dae1 ordering in mysql Sander Roosendaal 2019-10-22 14:33:36 +02:00
  • 964416362d bug fix in stroke force chart Sander Roosendaal 2019-10-22 08:37:09 +02:00