sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Commit Graph

  • 2f6ccd3891 removed temporary file Sander Roosendaal 2018-01-23 21:28:50 +01:00
  • fe8fb9e867 Merge tag 'v5.73' into develop Sander Roosendaal 2018-01-23 21:27:39 +01:00
  • fbff6d96ce Merge branch 'release/v5.73' Sander Roosendaal 2018-01-23 21:26:38 +01:00
  • ef47a42272 Merge branch 'feature/rotate' into develop Sander Roosendaal 2018-01-23 21:25:00 +01:00
  • f313f4ce47 removed temp files Sander Roosendaal 2018-01-23 21:23:37 +01:00
  • 58cdff8d0b fixed EXIF rotations Sander Roosendaal 2018-01-23 21:22:44 +01:00
  • 28729c37d4 bug fix Sander Roosendaal 2018-01-23 15:43:06 +01:00
  • a72cfc78c4 Merge tag 'v5.72' into develop Sander Roosendaal 2018-01-23 15:33:19 +01:00
  • 9f4747dd49 Merge branch 'release/v5.72' Sander Roosendaal 2018-01-23 15:32:21 +01:00
  • 064a36b112 Merge tag 'v5.71' into develop Sander Roosendaal 2018-01-23 15:25:18 +01:00
  • 4c2c05c707 Merge branch 'release/v5.71' Sander Roosendaal 2018-01-23 15:24:57 +01:00
  • 80f068c995 Merge branch 'feature/imgur' into develop Sander Roosendaal 2018-01-23 15:11:03 +01:00
  • ed56a4179a added image attach buttons to edit and workflow Sander Roosendaal 2018-01-23 15:10:17 +01:00
  • 22cba46f3b image upload working Sander Roosendaal 2018-01-23 14:37:52 +01:00
  • 983b3be86c restricted allowable static images to 6 Sander Roosendaal 2018-01-23 12:09:41 +01:00
  • 585b48cdf6 Merge tag 'v5.70' into develop Sander Roosendaal 2018-01-23 08:45:20 +01:00
  • 9557d62101 Merge branch 'hotfix/v5.70' Sander Roosendaal 2018-01-23 08:45:07 +01:00
  • 05cde74e3d bug fix timezone c2 import Sander Roosendaal 2018-01-23 08:41:52 +01:00
  • 9ae0f72c0f Merge tag 'v5.69' into develop Sander Roosendaal 2018-01-21 13:32:58 +01:00
  • 8cb5061b38 Merge branch 'hotfix/v5.69' Sander Roosendaal 2018-01-21 13:26:40 +01:00
  • e215f1a170 timezone bug fix Sander Roosendaal 2018-01-21 13:22:47 +01:00
  • 5f2ef40cc8 Merge tag 'v5.68' into develop Sander Roosendaal 2018-01-20 10:33:52 +01:00
  • cc6726e76a Merge branch 'hotfix/v5.68' Sander Roosendaal 2018-01-20 10:29:17 +01:00
  • 60a81e68fe bug fixes for non specified gender Sander Roosendaal 2018-01-20 10:25:34 +01:00
  • 5b635d9003 Merge tag 'v5.67' into develop Sander Roosendaal 2018-01-20 10:15:48 +01:00
  • e327b2b16a Merge branch 'release/v5.67' Sander Roosendaal 2018-01-20 10:14:49 +01:00
  • 7a2608f932 bug fix for update agegroup records if not specified sex Sander Roosendaal 2018-01-20 10:09:47 +01:00
  • 9fe4560e69 Merge tag 'v5.66' into develop Sander Roosendaal 2018-01-20 10:08:20 +01:00
  • 1bef73d20e Merge branch 'hotfix/v5.66' Sander Roosendaal 2018-01-20 10:07:40 +01:00
  • a5aa6d65f5 bug fix flex chart Sander Roosendaal 2018-01-20 10:04:32 +01:00
  • e99191ab07 Merge tag 'v5.65' into develop Sander Roosendaal 2018-01-20 09:47:08 +01:00
  • 637105c01f Merge branch 'hotfix/v5.65' Sander Roosendaal 2018-01-20 09:46:28 +01:00
  • bc6d12ee29 replace nan with negative value Sander Roosendaal 2018-01-20 09:43:38 +01:00
  • 14b6a9d381 bug fix Sander Roosendaal 2018-01-20 09:38:21 +01:00
  • 85c9f9b8bc Merge tag 'v5.64' into develop Sander Roosendaal 2018-01-19 18:06:59 +01:00
  • 7409638264 Merge branch 'hotfix/v5.64' Sander Roosendaal 2018-01-19 18:04:35 +01:00
  • 4f4d568463 added **kwargs to c2 tasks Sander Roosendaal 2018-01-19 18:01:39 +01:00
  • 217f8d57f8 Merge tag 'v5.63' into develop Sander Roosendaal 2018-01-19 17:54:13 +01:00
  • bad4e04b96 Merge branch 'release/v5.63' Sander Roosendaal 2018-01-19 17:52:54 +01:00
  • e0277da42a Merge branch 'feature/nostrokedataimport' into develop Sander Roosendaal 2018-01-19 17:44:44 +01:00
  • f9ccdd696b saved views.py Sander Roosendaal 2018-01-19 17:39:17 +01:00
  • e5b92cd514 import without stroke data now works Sander Roosendaal 2018-01-19 17:33:05 +01:00
  • 45703f4946 imports no stroke data by creating synthetic workout Sander Roosendaal 2018-01-19 16:54:55 +01:00
  • 0d1be41e6e c2stuff.create_async_workout start Sander Roosendaal 2018-01-19 13:14:23 +01:00
  • 8e6460eb06 removes temporary records in powertimefitnessmetric Sander Roosendaal 2018-01-19 08:34:58 +01:00
  • eea9efce2b Merge tag 'v5.62' into develop Sander Roosendaal 2018-01-17 22:45:07 +01:00
  • 61c2565b2e Merge branch 'release/v5.62' Sander Roosendaal 2018-01-17 22:43:51 +01:00
  • 3772ddc0a0 bug fix Sander Roosendaal 2018-01-17 22:37:23 +01:00
  • 3f734979a1 Merge tag 'v5.61' into develop Sander Roosendaal 2018-01-17 22:25:10 +01:00
  • e4bf935019 Merge branch 'release/v5.61' Sander Roosendaal 2018-01-17 22:23:59 +01:00
  • 95fd2dcde0 bugfix Sander Roosendaal 2018-01-17 22:14:33 +01:00
  • b6d0ab3587 Merge tag 'v5.6' into develop Sander Roosendaal 2018-01-17 21:42:57 +01:00
  • 762ce137df Merge branch 'release/v5.6' Sander Roosendaal 2018-01-17 21:41:23 +01:00
  • 3c70e241ad Merge branch 'feature/powertimefitnessmetric' into develop Sander Roosendaal 2018-01-17 21:33:18 +01:00
  • eb6625845f fixing bug Sander Roosendaal 2018-01-17 21:29:05 +01:00
  • 5917e3c5b8 some tweaks to make middleware working Sander Roosendaal 2018-01-17 18:39:02 +01:00
  • 30a325d0f5 updatefitnessmetric as middleware Sander Roosendaal 2018-01-17 18:27:59 +01:00
  • 40813c4a0e db insertion through sql now working Sander Roosendaal 2018-01-17 16:54:28 +01:00
  • fd88b8f375 added saving to db Sander Roosendaal 2018-01-16 17:42:47 +01:00
  • dd48d66c3a first attempt Sander Roosendaal 2018-01-16 17:04:30 +01:00
  • ed8c532884 added PowerTimeFitnessMetric model Sander Roosendaal 2018-01-16 15:56:53 +01:00
  • 8a916a4436 Merge branch 'feature/ranking' into develop Sander Roosendaal 2018-01-16 15:43:58 +01:00
  • e2a1511c92 Merge branch 'develop' into feature/ranking Sander Roosendaal 2018-01-16 15:36:55 +01:00
  • da4f2e32dc fixed unicodedecode error in workout split Sander Roosendaal 2018-01-16 15:29:25 +01:00
  • 5c0eeca049 Merge tag 'v5.54' into develop Sander Roosendaal 2018-01-14 20:40:40 +01:00
  • 9f9b524367 Merge branch 'hotfix/v5.54' Sander Roosendaal 2018-01-14 20:38:58 +01:00
  • 29612adc8b small bugfix index in dataprep Sander Roosendaal 2018-01-14 20:33:25 +01:00
  • 6a5406af83 Merge tag 'v5.53' into develop Sander Roosendaal 2018-01-12 19:55:43 +01:00
  • 9ab939f969 Merge branch 'hotfix/v5.53' Sander Roosendaal 2018-01-12 19:53:55 +01:00
  • cad6277ddc typo in remove_asynctask Sander Roosendaal 2018-01-12 19:51:08 +01:00
  • e560683dc7 Merge tag 'v5.52' into develop Sander Roosendaal 2018-01-12 19:34:48 +01:00
  • 3b4e171dbd Merge branch 'hotfix/v5.52' Sander Roosendaal 2018-01-12 19:34:08 +01:00
  • 848c82b3fd hotfix define success in cp plot Sander Roosendaal 2018-01-12 19:26:52 +01:00
  • 7d68021ddc Merge tag 'v5.51' into develop Sander Roosendaal 2018-01-12 10:49:33 +01:00
  • 64a5d89291 Merge branch 'hotfix/v5.51' Sander Roosendaal 2018-01-12 10:47:54 +01:00
  • ebbbe6f68a bug fix in otw ranking 2.0 Sander Roosendaal 2018-01-12 10:45:49 +01:00
  • ecea34c094 Merge tag 'v5.5' into develop Sander Roosendaal 2018-01-12 08:50:21 +01:00
  • 1dd9e9617c Merge branch 'release/v5.5' Sander Roosendaal 2018-01-12 08:48:38 +01:00
  • e8ca3abe20 added messaging on tasks status Sander Roosendaal 2018-01-10 20:30:43 +01:00
  • d0455a97c0 bug fix in RowerForm cleaning up Sander Roosendaal 2018-01-09 13:29:37 +01:00
  • ad3ef6c5ce Merge branch 'develop' into feature/ranking Sander Roosendaal 2018-01-09 09:00:03 +01:00
  • 22eb1c0f9a added filtering on OTW efficiency < 200 Sander Roosendaal 2018-01-09 08:48:10 +01:00
  • 0187f3200e added links to concept2 rankings and World Records Sander Roosendaal 2018-01-08 17:13:16 +01:00
  • b53843322a Merge tag 'v5.48' into develop Sander Roosendaal 2018-01-06 13:40:09 +01:00
  • 1f782e674d Merge branch 'release/v5.48' Sander Roosendaal 2018-01-06 13:39:38 +01:00
  • bdf4546a29 using async job to calculate predicted age records and store in db Sander Roosendaal 2018-01-06 13:33:59 +01:00
  • 89b0a4f61f Merge tag 'v5.47' into develop Sander Roosendaal 2018-01-06 10:40:47 +01:00
  • b03d0d2b53 Merge branch 'release/v5.47' Sander Roosendaal 2018-01-06 10:38:35 +01:00
  • cd94649e0b bug fix order of activity chart Sander Roosendaal 2018-01-06 09:59:18 +01:00
  • 599a30cfa7 Merge branch 'feature/fasterranking' into develop Sander Roosendaal 2018-01-05 16:26:05 +01:00
  • 9daf876054 cleaning up junk Sander Roosendaal 2018-01-05 16:17:35 +01:00
  • df7f300d87 quickened Ranking 2.0 Sander Roosendaal 2018-01-05 16:16:11 +01:00
  • 545d8e4906 prep for speeding up rankings view 2.0 Sander Roosendaal 2018-01-05 11:44:12 +01:00
  • b3a97a9c25 Merge tag 'v5.46' into develop Sander Roosendaal 2018-01-05 11:10:40 +01:00
  • 223f9557e8 Merge branch 'hotfix/v5.46' Sander Roosendaal 2018-01-05 11:09:42 +01:00
  • 81408aca34 changed critical power headings Sander Roosendaal 2018-01-05 11:00:32 +01:00
  • 7d566a1ae2 Merge tag 'v5.44' into develop Sander Roosendaal 2018-01-04 21:58:02 +01:00
  • e73e0aaf9c Merge branch 'release/v5.44' Sander Roosendaal 2018-01-04 21:57:25 +01:00
  • 268b6afdb5 Merge branch 'feature/rankingstars' into develop Sander Roosendaal 2018-01-04 21:54:44 +01:00
  • 275124976d Basic ranking page now uses only workouts marked as ranking pieces Sander Roosendaal 2018-01-04 21:52:24 +01:00