Private
Public Access
1
0

9384 Commits

Author SHA1 Message Date
Sander Roosendaal
f2294126a9 dataprep4 2016-11-27 21:53:27 +01:00
Sander Roosendaal
0fcaf6338d Merge tag 'dataprep3' into develop
dataprep close connection
2016-11-27 21:20:12 +01:00
Sander Roosendaal
db4c78e42d Merge branch 'release/dataprep3' 2016-11-27 21:19:57 +01:00
Sander Roosendaal
a6488377f3 Database engine close 2016-11-27 21:08:04 +01:00
Sander Roosendaal
a98319de6d Merge tag 'dataprep2' into develop
Fixed Dataprep
2016-11-27 20:29:10 +01:00
Sander Roosendaal
04fdf6777d Merge branch 'release/dataprep2' 2016-11-27 20:28:47 +01:00
Sander Roosendaal
75ddb92349 Fixed dataprep 2016-11-27 20:18:11 +01:00
Sander Roosendaal
b2267ca524 Merge tag 'pacetimevals' into develop
hotfix dataprep values
2016-11-27 19:15:57 +01:00
Sander Roosendaal
b700f8aa9a Merge branch 'hotfix/pacetimevals' 2016-11-27 19:15:24 +01:00
Sander Roosendaal
c27e67a166 quick fix data 2016-11-27 19:14:07 +01:00
Sander Roosendaal
4c545bed3b Merge tag 'dbupdate' into develop
database update
2016-11-27 13:34:17 +01:00
Sander Roosendaal
f989a05b3a Merge branch 'release/dbupdate' 2016-11-27 13:33:58 +01:00
Sander Roosendaal
686f2d643c Merge branch 'feature/restapi' into develop 2016-11-27 13:27:34 +01:00
Sander Roosendaal
2b8527074e Strokedata post working (somehow) 2016-11-26 21:32:37 +01:00
Sander Roosendaal
0facd70ac1 testing api 2016-11-26 17:41:08 +01:00
Sander Roosendaal
aed20dc816 cleaning up 2016-11-26 09:25:43 +01:00
Sander Roosendaal
70f4a187ab oauth working again (CORS allow all) 2016-11-26 09:24:43 +01:00
Sander Roosendaal
3ef5c40be4 untested POST version of stroke_data API 2016-11-25 20:31:44 +01:00
Sander Roosendaal
88da49a00e Testing seems to hang 2016-11-25 16:22:39 +01:00
Sander Roosendaal
af3396cfee started with StrokeData POST 2016-11-25 15:27:46 +01:00
Sander Roosendaal
2773597472 Merge tag 'cumflexplot' into develop
Bug fix on cumulative flex plot
2016-11-24 13:51:55 +01:00
Sander Roosendaal
c693c1eaba Merge branch 'hotfix/cumflexplot' 2016-11-24 13:51:25 +01:00
Sander Roosendaal
ef345cce39 Fixed bug 2016-11-24 13:50:58 +01:00
Sander Roosendaal
44b2145f2f Oauth2 checks 2016-11-24 13:40:29 +01:00
Sander Roosendaal
b8643ca897 some more improvements 2016-11-24 00:03:33 +01:00
Sander Roosendaal
bf32c1cc21 Merge branch 'develop' into feature/restapi 2016-11-23 23:22:05 +01:00
Sander Roosendaal
3624f5668d Merge tag 'daterange' into develop
hotfix daterange
2016-11-23 23:17:38 +01:00
Sander Roosendaal
e0f3dcb014 Merge branch 'hotfix/daterange' 2016-11-23 23:17:24 +01:00
Sander Roosendaal
1efe6b1673 Date ranges - added one day to end date (time zone) 2016-11-23 23:15:19 +01:00
Sander Roosendaal
c667f3acd4 first crude strokedata get method 2016-11-23 18:23:10 +01:00
Sander Roosendaal
69f9aca132 Dataprep upon upload 2016-11-23 16:16:08 +01:00
Sander Roosendaal
402c7c1390 Preparations for strokedata API 2016-11-23 15:38:02 +01:00
Sander Roosendaal
efb5b9f8ab Merge branch 'develop' into feature/restapi 2016-11-23 14:58:16 +01:00
Sander Roosendaal
73f4c713a0 Added StrokeData model 2016-11-22 23:17:46 +01:00
Sander Roosendaal
660c0183f6 Merge tag 'histo' into develop
histo+daterange+search
2016-11-22 16:40:40 +01:00
Sander Roosendaal
5c46d81b19 Merge branch 'release/histo' 2016-11-22 16:40:20 +01:00
Sander Roosendaal
2f2758fccb Fixed bug on comparison 2016-11-22 16:39:46 +01:00
Sander Roosendaal
55ee7e1d53 Added histogram for single workout 2016-11-22 16:31:47 +01:00
Sander Roosendaal
93bd2d26bf Date Ranges for workouts and comparisons 2016-11-22 15:02:53 +01:00
Sander Roosendaal
4fb1bee385 Search form and pagination 2016-11-22 13:58:32 +01:00
Sander Roosendaal
f57efd0166 Replaced http with https 2016-11-22 11:17:41 +01:00
Sander Roosendaal
e1cc1174c6 Merge tag 'keepdaterange' into develop
keepdaterange
2016-11-22 11:07:31 +01:00
Sander Roosendaal
ccae6ee469 Merge branch 'release/keepdaterange' 2016-11-22 11:07:09 +01:00
Sander Roosendaal
111ade8017 Error on None (secondary y axis) 2016-11-22 11:04:32 +01:00
Sander Roosendaal
b16c6c7fbd Reduced data stream to cum_flex 2016-11-22 10:49:55 +01:00
Sander Roosendaal
d57ecb495b Oauth2 provider and initial api 2016-11-20 14:46:46 +01:00
Sander Roosendaal
dad87fe7f5 Merge tag 'powersummaryotw' into develop
Summary update button
2016-11-19 21:19:51 +01:00
Sander Roosendaal
26231f7eee Merge branch 'hotfix/powersummaryotw' 2016-11-19 21:19:05 +01:00
Sander Roosendaal
219707af0b Hotfix summary update button 2016-11-19 21:18:17 +01:00
Sander Roosendaal
60edc3f3c2 further playing 2016-11-19 14:22:34 +01:00