Private
Public Access
1
0

Commit Graph

  • 47415ec2d7 Merge tag 'otwbugfix' into develop Sander Roosendaal 2016-12-01 21:50:54 +01:00
  • 9b2a980ebc Merge branch 'release/otwbugfix' Sander Roosendaal 2016-12-01 21:50:29 +01:00
  • b2f4ce7ba0 OTW bug fix Sander Roosendaal 2016-12-01 21:49:43 +01:00
  • 0fdb48694b Merge tag 'correctedpowerplot' into develop Sander Roosendaal 2016-12-01 21:06:19 +01:00
  • 4da671d2e7 Merge branch 'release/correctedpowerplot' Sander Roosendaal 2016-12-01 21:05:53 +01:00
  • 6b2e474d7b OTW physics Sander Roosendaal 2016-12-01 20:59:48 +01:00
  • d7fb32923a Merge tag 'empower-physics' into develop Sander Roosendaal 2016-12-01 20:00:57 +01:00
  • 3ecf84764f Merge branch 'release/empower-physics' Sander Roosendaal 2016-12-01 20:00:39 +01:00
  • 1a9979a741 rowing physics tasks to work with empower Sander Roosendaal 2016-12-01 17:51:47 +01:00
  • a98e724d3a Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-01 14:37:01 +01:00
  • 2a62db3703 Merge tag 'nkempowerplots' into develop Sander Roosendaal 2016-12-01 14:31:29 +01:00
  • 07add450df Merge branch 'release/nkempowerplots' Sander Roosendaal 2016-12-01 14:31:16 +01:00
  • 2bef89bbb6 Updated test suite Sander Roosendaal 2016-12-01 14:30:52 +01:00
  • b8a33e3c0d Merge branch 'feature/nk-tools-physics' into develop Sander Roosendaal 2016-12-01 14:18:09 +01:00
  • ec93030ba6 NK Empower tools Sander Roosendaal 2016-12-01 14:15:42 +01:00
  • 5da598e9c8 Dataprep for Empower data Sander Roosendaal 2016-12-01 11:23:35 +01:00
  • 51ef777c30 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-11-30 10:54:42 +01:00
  • b0c54f1fcd Merge tag 'empowerdatabase' into develop Sander Roosendaal 2016-11-29 22:24:17 +01:00
  • d8455c1645 Merge branch 'release/empowerdatabase' Sander Roosendaal 2016-11-29 22:24:01 +01:00
  • 8d9816a238 empower Sander Roosendaal 2016-11-29 22:20:17 +01:00
  • 40ead488dd Merge tag 'dataprotection' into develop Sander Roosendaal 2016-11-28 21:40:42 +01:00
  • b410a38c24 Merge branch 'hotfix/dataprotection' Sander Roosendaal 2016-11-28 21:38:47 +01:00
  • 0798d05fca protect api data Sander Roosendaal 2016-11-28 21:37:36 +01:00
  • 67f2b5fc80 Merge tag 'boatcoach' into develop Sander Roosendaal 2016-11-28 18:03:05 +01:00
  • d35d8b3421 Merge branch 'release/boatcoach' Sander Roosendaal 2016-11-28 18:02:52 +01:00
  • da7f679c30 boatcoach Sander Roosendaal 2016-11-28 17:58:32 +01:00
  • 45ac5f80a3 Reponse Codes Sander Roosendaal 2016-11-28 15:49:46 +01:00
  • 962bc20513 settings Sander Roosendaal 2016-11-28 14:33:10 +01:00
  • f3117bd4c6 static files Sander Roosendaal 2016-11-28 12:05:36 +01:00
  • 3f3f98e01d removed last timefields from strokedata model Sander Roosendaal 2016-11-28 09:54:36 +01:00
  • 4816c095d0 equivergpace and nowindpace data Sander Roosendaal 2016-11-28 09:52:39 +01:00
  • 65ec7640b1 Merge tag 'smoothen' into develop Sander Roosendaal 2016-11-28 09:43:00 +01:00
  • 432e98aa93 Merge branch 'release/smoothen' Sander Roosendaal 2016-11-28 09:42:47 +01:00
  • fd518a854b smoothen+otwpower Sander Roosendaal 2016-11-28 09:39:24 +01:00
  • d4ed9419ae Merge tag 'indexing' into develop Sander Roosendaal 2016-11-28 08:08:41 +01:00
  • f7e4e7a79c Merge branch 'release/indexing' Sander Roosendaal 2016-11-28 08:08:31 +01:00
  • f23a134aba indexing on workoutid Sander Roosendaal 2016-11-28 08:00:02 +01:00
  • ee5f91fe5a Merge tag 'dataprep7' into develop Sander Roosendaal 2016-11-27 22:33:09 +01:00
  • 433b87fc4c Merge branch 'release/dataprep7' Sander Roosendaal 2016-11-27 22:32:43 +01:00
  • dafc0e10cc dataprep7 Sander Roosendaal 2016-11-27 22:31:41 +01:00
  • de059743ac Merge tag 'dataprep6' into develop Sander Roosendaal 2016-11-27 22:17:54 +01:00
  • a39b5932d6 Merge branch 'release/dataprep6' Sander Roosendaal 2016-11-27 22:17:29 +01:00
  • 58cf83f7cf dataprep6 Sander Roosendaal 2016-11-27 22:16:26 +01:00
  • 59b8a5b8f8 Merge tag 'dataprep5' into develop Sander Roosendaal 2016-11-27 22:12:36 +01:00
  • 0c10cf7c3c Merge branch 'release/dataprep5' Sander Roosendaal 2016-11-27 22:12:14 +01:00
  • db29c4152d check for nan Sander Roosendaal 2016-11-27 22:11:24 +01:00
  • 47c92e2fbe Merge tag 'dataprep4' into develop Sander Roosendaal 2016-11-27 21:56:44 +01:00
  • e888e317e3 Merge branch 'release/dataprep4' Sander Roosendaal 2016-11-27 21:56:27 +01:00
  • f2294126a9 dataprep4 Sander Roosendaal 2016-11-27 21:53:27 +01:00
  • 0fcaf6338d Merge tag 'dataprep3' into develop Sander Roosendaal 2016-11-27 21:20:12 +01:00
  • db4c78e42d Merge branch 'release/dataprep3' Sander Roosendaal 2016-11-27 21:19:57 +01:00
  • a6488377f3 Database engine close Sander Roosendaal 2016-11-27 21:08:04 +01:00
  • a98319de6d Merge tag 'dataprep2' into develop Sander Roosendaal 2016-11-27 20:29:10 +01:00
  • 04fdf6777d Merge branch 'release/dataprep2' Sander Roosendaal 2016-11-27 20:28:47 +01:00
  • 75ddb92349 Fixed dataprep Sander Roosendaal 2016-11-27 20:18:11 +01:00
  • b2267ca524 Merge tag 'pacetimevals' into develop Sander Roosendaal 2016-11-27 19:15:57 +01:00
  • b700f8aa9a Merge branch 'hotfix/pacetimevals' Sander Roosendaal 2016-11-27 19:15:24 +01:00
  • c27e67a166 quick fix data Sander Roosendaal 2016-11-27 19:14:07 +01:00
  • 4c545bed3b Merge tag 'dbupdate' into develop Sander Roosendaal 2016-11-27 13:34:17 +01:00
  • f989a05b3a Merge branch 'release/dbupdate' Sander Roosendaal 2016-11-27 13:33:58 +01:00
  • 686f2d643c Merge branch 'feature/restapi' into develop Sander Roosendaal 2016-11-27 13:27:34 +01:00
  • 2b8527074e Strokedata post working (somehow) Sander Roosendaal 2016-11-26 21:32:37 +01:00
  • 0facd70ac1 testing api Sander Roosendaal 2016-11-26 17:41:08 +01:00
  • aed20dc816 cleaning up Sander Roosendaal 2016-11-26 09:25:43 +01:00
  • 70f4a187ab oauth working again (CORS allow all) Sander Roosendaal 2016-11-26 09:24:43 +01:00
  • 3ef5c40be4 untested POST version of stroke_data API Sander Roosendaal 2016-11-25 20:31:44 +01:00
  • 88da49a00e Testing seems to hang Sander Roosendaal 2016-11-25 16:22:39 +01:00
  • af3396cfee started with StrokeData POST Sander Roosendaal 2016-11-25 15:27:46 +01:00
  • 2773597472 Merge tag 'cumflexplot' into develop Sander Roosendaal 2016-11-24 13:51:55 +01:00
  • c693c1eaba Merge branch 'hotfix/cumflexplot' Sander Roosendaal 2016-11-24 13:51:25 +01:00
  • ef345cce39 Fixed bug Sander Roosendaal 2016-11-24 13:50:58 +01:00
  • 44b2145f2f Oauth2 checks Sander Roosendaal 2016-11-24 13:40:29 +01:00
  • b8643ca897 some more improvements Sander Roosendaal 2016-11-24 00:03:33 +01:00
  • bf32c1cc21 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-11-23 23:22:05 +01:00
  • 3624f5668d Merge tag 'daterange' into develop Sander Roosendaal 2016-11-23 23:17:38 +01:00
  • e0f3dcb014 Merge branch 'hotfix/daterange' Sander Roosendaal 2016-11-23 23:17:24 +01:00
  • 1efe6b1673 Date ranges - added one day to end date (time zone) Sander Roosendaal 2016-11-23 23:15:19 +01:00
  • c667f3acd4 first crude strokedata get method Sander Roosendaal 2016-11-23 18:23:10 +01:00
  • 69f9aca132 Dataprep upon upload Sander Roosendaal 2016-11-23 16:16:08 +01:00
  • 402c7c1390 Preparations for strokedata API Sander Roosendaal 2016-11-23 15:38:02 +01:00
  • efb5b9f8ab Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-11-23 14:58:16 +01:00
  • 73f4c713a0 Added StrokeData model Sander Roosendaal 2016-11-22 23:17:46 +01:00
  • 660c0183f6 Merge tag 'histo' into develop Sander Roosendaal 2016-11-22 16:40:40 +01:00
  • 5c46d81b19 Merge branch 'release/histo' Sander Roosendaal 2016-11-22 16:40:20 +01:00
  • 2f2758fccb Fixed bug on comparison Sander Roosendaal 2016-11-22 16:39:46 +01:00
  • 55ee7e1d53 Added histogram for single workout Sander Roosendaal 2016-11-22 16:31:47 +01:00
  • 93bd2d26bf Date Ranges for workouts and comparisons Sander Roosendaal 2016-11-22 15:02:53 +01:00
  • 4fb1bee385 Search form and pagination Sander Roosendaal 2016-11-22 13:58:32 +01:00
  • f57efd0166 Replaced http with https Sander Roosendaal 2016-11-22 11:17:41 +01:00
  • e1cc1174c6 Merge tag 'keepdaterange' into develop Sander Roosendaal 2016-11-22 11:07:31 +01:00
  • ccae6ee469 Merge branch 'release/keepdaterange' Sander Roosendaal 2016-11-22 11:07:09 +01:00
  • 111ade8017 Error on None (secondary y axis) Sander Roosendaal 2016-11-22 11:04:32 +01:00
  • b16c6c7fbd Reduced data stream to cum_flex Sander Roosendaal 2016-11-22 10:49:55 +01:00
  • d57ecb495b Oauth2 provider and initial api Sander Roosendaal 2016-11-20 14:46:46 +01:00
  • dad87fe7f5 Merge tag 'powersummaryotw' into develop Sander Roosendaal 2016-11-19 21:19:51 +01:00
  • 26231f7eee Merge branch 'hotfix/powersummaryotw' Sander Roosendaal 2016-11-19 21:19:05 +01:00
  • 219707af0b Hotfix summary update button Sander Roosendaal 2016-11-19 21:18:17 +01:00
  • 60edc3f3c2 further playing Sander Roosendaal 2016-11-19 14:22:34 +01:00
  • eb055d5f32 Adding swagger Sander Roosendaal 2016-11-19 11:20:51 +01:00
  • c6726245c2 Initial playing around Sander Roosendaal 2016-11-19 10:44:59 +01:00