Sander Roosendaal
|
54c9b521ea
|
Merge tag 'togglestrokes' into develop
togglestrokes hotfix
|
2016-12-03 08:58:56 +01:00 |
|
Sander Roosendaal
|
5fb7285fdc
|
Merge branch 'hotfix/togglestrokes'
|
2016-12-03 08:58:43 +01:00 |
|
Sander Roosendaal
|
c4cf0a9afb
|
togglestrokes hotfix
|
2016-12-03 08:57:56 +01:00 |
|
Sander Roosendaal
|
769eab2692
|
Merge branch 'develop' into feature/restapi
|
2016-12-02 19:40:49 +01:00 |
|
Sander Roosendaal
|
0b1df3a535
|
Merge tag 'datums' into develop
datums
|
2016-12-02 19:39:49 +01:00 |
|
Sander Roosendaal
|
57bb03c81f
|
Merge branch 'release/datums'
|
2016-12-02 19:39:33 +01:00 |
|
Sander Roosendaal
|
afdf9a93a4
|
Datums
|
2016-12-02 19:38:10 +01:00 |
|
Sander Roosendaal
|
f886713639
|
Merge branch 'develop' into feature/restapi
|
2016-12-02 09:35:31 +01:00 |
|
Sander Roosendaal
|
22ba557626
|
Merge tag 'bugfixx' into develop
bugfixx
|
2016-12-01 22:13:44 +01:00 |
|
Sander Roosendaal
|
2c3212bbc3
|
Merge branch 'release/bugfixx'
|
2016-12-01 22:13:24 +01:00 |
|
Sander Roosendaal
|
7c40ad3df1
|
bug fix
|
2016-12-01 22:12:36 +01:00 |
|
Sander Roosendaal
|
47415ec2d7
|
Merge tag 'otwbugfix' into develop
bug fix OTW power
|
2016-12-01 21:50:54 +01:00 |
|
Sander Roosendaal
|
9b2a980ebc
|
Merge branch 'release/otwbugfix'
|
2016-12-01 21:50:29 +01:00 |
|
Sander Roosendaal
|
b2f4ce7ba0
|
OTW bug fix
|
2016-12-01 21:49:43 +01:00 |
|
Sander Roosendaal
|
0fdb48694b
|
Merge tag 'correctedpowerplot' into develop
corrected pace plot OTW
|
2016-12-01 21:06:19 +01:00 |
|
Sander Roosendaal
|
4da671d2e7
|
Merge branch 'release/correctedpowerplot'
|
2016-12-01 21:05:53 +01:00 |
|
Sander Roosendaal
|
6b2e474d7b
|
OTW physics
|
2016-12-01 20:59:48 +01:00 |
|
Sander Roosendaal
|
d7fb32923a
|
Merge tag 'empower-physics' into develop
Empower-physics
|
2016-12-01 20:00:57 +01:00 |
|
Sander Roosendaal
|
3ecf84764f
|
Merge branch 'release/empower-physics'
|
2016-12-01 20:00:39 +01:00 |
|
Sander Roosendaal
|
1a9979a741
|
rowing physics tasks to work with empower
|
2016-12-01 17:51:47 +01:00 |
|
Sander Roosendaal
|
a98e724d3a
|
Merge branch 'develop' into feature/restapi
|
2016-12-01 14:37:01 +01:00 |
|
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 |
|