Sander Roosendaal
|
2a62db3703
|
Merge tag 'nkempowerplots' into develop
NK EMpower plots
|
2016-12-01 14:31:29 +01:00 |
|
Sander Roosendaal
|
07add450df
|
Merge branch 'release/nkempowerplots'
|
2016-12-01 14:31:16 +01:00 |
|
Sander Roosendaal
|
2bef89bbb6
|
Updated test suite
|
2016-12-01 14:30:52 +01:00 |
|
Sander Roosendaal
|
b8a33e3c0d
|
Merge branch 'feature/nk-tools-physics' into develop
|
2016-12-01 14:18:09 +01:00 |
|
Sander Roosendaal
|
ec93030ba6
|
NK Empower tools
|
2016-12-01 14:15:42 +01:00 |
|
Sander Roosendaal
|
5da598e9c8
|
Dataprep for Empower data
|
2016-12-01 11:23:35 +01:00 |
|
Sander Roosendaal
|
51ef777c30
|
Merge branch 'develop' into feature/restapi
|
2016-11-30 10:54:42 +01:00 |
|
Sander Roosendaal
|
b0c54f1fcd
|
Merge tag 'empowerdatabase' into develop
empowerdatabase
|
2016-11-29 22:24:17 +01:00 |
|
Sander Roosendaal
|
d8455c1645
|
Merge branch 'release/empowerdatabase'
|
2016-11-29 22:24:01 +01:00 |
|
Sander Roosendaal
|
8d9816a238
|
empower
|
2016-11-29 22:20:17 +01:00 |
|
Sander Roosendaal
|
40ead488dd
|
Merge tag 'dataprotection' into develop
dataprotection for api
|
2016-11-28 21:40:42 +01:00 |
|
Sander Roosendaal
|
b410a38c24
|
Merge branch 'hotfix/dataprotection'
|
2016-11-28 21:38:47 +01:00 |
|
Sander Roosendaal
|
0798d05fca
|
protect api data
|
2016-11-28 21:37:36 +01:00 |
|
Sander Roosendaal
|
67f2b5fc80
|
Merge tag 'boatcoach' into develop
boatcoach
|
2016-11-28 18:03:05 +01:00 |
|
Sander Roosendaal
|
d35d8b3421
|
Merge branch 'release/boatcoach'
|
2016-11-28 18:02:52 +01:00 |
|
Sander Roosendaal
|
da7f679c30
|
boatcoach
|
2016-11-28 17:58:32 +01:00 |
|
Sander Roosendaal
|
45ac5f80a3
|
Reponse Codes
|
2016-11-28 15:49:46 +01:00 |
|
Sander Roosendaal
|
962bc20513
|
settings
|
2016-11-28 14:33:10 +01:00 |
|
Sander Roosendaal
|
f3117bd4c6
|
static files
|
2016-11-28 12:05:36 +01:00 |
|
Sander Roosendaal
|
3f3f98e01d
|
removed last timefields from strokedata model
|
2016-11-28 09:54:36 +01:00 |
|
Sander Roosendaal
|
4816c095d0
|
equivergpace and nowindpace data
|
2016-11-28 09:52:39 +01:00 |
|
Sander Roosendaal
|
65ec7640b1
|
Merge tag 'smoothen' into develop
smoothen+otwpower
|
2016-11-28 09:43:00 +01:00 |
|
Sander Roosendaal
|
432e98aa93
|
Merge branch 'release/smoothen'
|
2016-11-28 09:42:47 +01:00 |
|
Sander Roosendaal
|
fd518a854b
|
smoothen+otwpower
|
2016-11-28 09:39:24 +01:00 |
|
Sander Roosendaal
|
d4ed9419ae
|
Merge tag 'indexing' into develop
indexing
|
2016-11-28 08:08:41 +01:00 |
|
Sander Roosendaal
|
f7e4e7a79c
|
Merge branch 'release/indexing'
|
2016-11-28 08:08:31 +01:00 |
|
Sander Roosendaal
|
f23a134aba
|
indexing on workoutid
|
2016-11-28 08:00:02 +01:00 |
|
Sander Roosendaal
|
ee5f91fe5a
|
Merge tag 'dataprep7' into develop
dataprep7
|
2016-11-27 22:33:09 +01:00 |
|
Sander Roosendaal
|
433b87fc4c
|
Merge branch 'release/dataprep7'
|
2016-11-27 22:32:43 +01:00 |
|
Sander Roosendaal
|
dafc0e10cc
|
dataprep7
|
2016-11-27 22:31:41 +01:00 |
|
Sander Roosendaal
|
de059743ac
|
Merge tag 'dataprep6' into develop
dataprep6
|
2016-11-27 22:17:54 +01:00 |
|
Sander Roosendaal
|
a39b5932d6
|
Merge branch 'release/dataprep6'
|
2016-11-27 22:17:29 +01:00 |
|
Sander Roosendaal
|
58cf83f7cf
|
dataprep6
|
2016-11-27 22:16:26 +01:00 |
|
Sander Roosendaal
|
59b8a5b8f8
|
Merge tag 'dataprep5' into develop
dataprep5
|
2016-11-27 22:12:36 +01:00 |
|
Sander Roosendaal
|
0c10cf7c3c
|
Merge branch 'release/dataprep5'
|
2016-11-27 22:12:14 +01:00 |
|
Sander Roosendaal
|
db29c4152d
|
check for nan
|
2016-11-27 22:11:24 +01:00 |
|
Sander Roosendaal
|
47c92e2fbe
|
Merge tag 'dataprep4' into develop
dataprep4
|
2016-11-27 21:56:44 +01:00 |
|
Sander Roosendaal
|
e888e317e3
|
Merge branch 'release/dataprep4'
|
2016-11-27 21:56:27 +01:00 |
|
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 |
|