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
|
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
|
8f6dc13d9f
|
Merge tag 'annotations' into develop
annotations
|
2016-11-18 19:11:11 +01:00 |
|
Sander Roosendaal
|
aad3aac311
|
Merge branch 'release/annotations'
|
2016-11-18 19:10:55 +01:00 |
|
Sander Roosendaal
|
c3e8bc28a5
|
Annotations
|
2016-11-18 15:28:57 +01:00 |
|
Sander Roosendaal
|
ae7b7fb9ab
|
Email confirmations for workouts received
|
2016-11-18 13:52:22 +01:00 |
|
Sander Roosendaal
|
439bca2f9c
|
Added Average/Peak Force Ratio
|
2016-11-18 13:12:57 +01:00 |
|
Sander Roosendaal
|
836a3f6dee
|
Tests for SportTracks and Strava data structures
|
2016-11-14 14:53:36 +01:00 |
|
Sander Roosendaal
|
a80e48978a
|
added rowpro to compatibility list
|
2016-11-14 09:03:37 +01:00 |
|
Sander Roosendaal
|
795d94df16
|
Merge tag 'smoothing' into develop
Improved autosmooth
|
2016-11-13 12:00:08 +01:00 |
|
Sander Roosendaal
|
f4f6513758
|
Merge branch 'release/smoothing'
|
2016-11-13 11:59:49 +01:00 |
|
Sander Roosendaal
|
ae0d95ecb5
|
Improved Smoothing
|
2016-11-13 11:55:15 +01:00 |
|
Sander Roosendaal
|
780c1f9611
|
Updated About page and added Compatibility page
|
2016-11-10 16:29:06 +01:00 |
|
Sander Roosendaal
|
9033221a3a
|
Merge tag 'powerzones' into develop
powerzones
|
2016-11-09 00:06:37 +01:00 |
|
Sander Roosendaal
|
9522755283
|
Merge branch 'release/powerzones'
|
2016-11-09 00:06:01 +01:00 |
|
Sander Roosendaal
|
c9e2bc9721
|
Merge branch 'feature/powerzones' into develop
|
2016-11-09 00:01:52 +01:00 |
|
Sander Roosendaal
|
cde106bb19
|
power zones
|
2016-11-09 00:00:13 +01:00 |
|
Roosendaal
|
48044108b2
|
Removed wrongly copied files
|
2016-11-08 19:54:19 +01:00 |
|
sanderroosendaal
|
3444995880
|
Initial updates (rowerpowerform) and ftp everywhere rrower is called
|
2016-11-08 10:31:27 +01:00 |
|
sanderroosendaal
|
02a12585a2
|
removed static plots from commit
|
2016-11-07 14:47:26 +01:00 |
|
sanderroosendaal
|
bbcbee2bb1
|
Merge tag 'bugfix_c2callback' into develop
bugfix_c2callback
|
2016-11-07 14:25:38 +01:00 |
|
sanderroosendaal
|
bb43018fda
|
Merge branch 'release/bugfix_c2callback'
|
2016-11-07 14:25:05 +01:00 |
|
sanderroosendaal
|
51de3f9c5e
|
Fixed bug when user pressed Red Deny Access button on C2 logbook
|
2016-11-07 14:20:51 +01:00 |
|
sanderroosendaal
|
57243e3187
|
Updated
|
2016-11-06 18:52:59 +01:00 |
|
sanderroosendaal
|
52f6d180df
|
Merge branch 'feature/restapitesting' into develop
|
2016-11-06 17:56:41 +01:00 |
|
sanderroosendaal
|
1a1b1d403f
|
Added simple test for C2 Stroke data
|
2016-11-06 17:55:51 +01:00 |
|
sanderroosendaal
|
689749567b
|
Merge tag 'dragfactor' into develop
Dragfactor 1.1
|
2016-11-06 17:02:19 +01:00 |
|
sanderroosendaal
|
aa02d10bfc
|
Merge branch 'release/dragfactor'
|
2016-11-06 17:02:02 +01:00 |
|
sanderroosendaal
|
3a1bee888f
|
Merge branch 'feature/dragfactor' into develop
|
2016-11-06 16:58:26 +01:00 |
|
sanderroosendaal
|
d1a8bacc9a
|
Updated C2 import function to add zero drag factor
|
2016-11-06 16:57:35 +01:00 |
|
sanderroosendaal
|
464550deb9
|
Added minimock and created new class in tests.py - work in progress
|
2016-11-06 16:35:41 +01:00 |
|
sanderroosendaal
|
cb4784e214
|
Edited settings.py to make mail processing work
|
2016-11-05 13:39:18 +01:00 |
|
sanderroosendaal
|
a32fdcf636
|
Merge branch 'master' into develop
|
2016-11-03 15:17:18 +01:00 |
|
sanderroosendaal
|
08120c5192
|
Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall
|
2016-11-03 15:12:21 +01:00 |
|
sanderroosendaal
|
57938ef19d
|
Merge tag 'dataprep' into develop
dataprep
|
2016-11-03 15:10:04 +01:00 |
|
sanderroosendaal
|
7006ccc008
|
Merge branch 'release/dataprep'
|
2016-11-03 15:09:43 +01:00 |
|
sanderroosendaal
|
3cba8e5e45
|
Fixed Ranking distances
|
2016-11-03 12:03:56 +01:00 |
|
sanderroosendaal
|
8a0518d7eb
|
All Interactive plots now use the dataprep functions
|
2016-11-03 10:26:59 +01:00 |
|
sanderroosendaal
|
902357ba5c
|
gitignore updated
|
2016-11-02 21:14:03 +01:00 |
|
Sander
|
ff4cc5dfa2
|
Merge branch 'master' of bitbucket.org:sanderroosendaal/rowsandall
Conflicts:
manage.py
|
2016-11-02 21:07:18 +01:00 |
|
Sander
|
7ab14e8980
|
added manage.py to gitignore
|
2016-11-02 21:04:50 +01:00 |
|
sanderroosendaal
|
04c1b2ef13
|
Added manage.py to git
|
2016-11-02 20:50:56 +01:00 |
|
sanderroosendaal
|
886d5417ed
|
Added manage.py to gitignore
|
2016-11-02 20:46:28 +01:00 |
|
sanderroosendaal
|
0b1f542e26
|
Added media to gitignore
|
2016-11-02 20:41:45 +01:00 |
|