Sander Roosendaal
|
c296f46b96
|
Changed default power zone values and names
|
2017-01-26 13:38:40 +01:00 |
|
Sander Roosendaal
|
5a74f8cb2f
|
Merge tag 'flexzonefix2' into develop
fix pie chart
|
2017-01-25 22:21:29 +01:00 |
|
Sander Roosendaal
|
99a9ca9686
|
Merge branch 'release/flexzonefix2'
|
2017-01-25 22:20:56 +01:00 |
|
Sander Roosendaal
|
dc409e38bc
|
Piechart fix
|
2017-01-25 22:17:06 +01:00 |
|
Sander Roosendaal
|
a96f93456f
|
Merge tag 'flexpowerzonesbugfix' into develop
Bug fix flex power zones
|
2017-01-25 22:01:29 +01:00 |
|
Sander Roosendaal
|
6dd4f4c391
|
Merge branch 'release/flexpowerzonesbugfix'
|
2017-01-25 22:01:00 +01:00 |
|
Sander Roosendaal
|
9072d50f5a
|
bug fix flex power zones
|
2017-01-25 21:59:35 +01:00 |
|
Sander Roosendaal
|
3cec874a84
|
add FTP and power to makeplot
|
2017-01-25 21:24:36 +01:00 |
|
Sander Roosendaal
|
c8ad85868e
|
Merge tag 'flexpowerzones' into develop
Flex Power Zones
|
2017-01-25 21:12:10 +01:00 |
|
Sander Roosendaal
|
cf1df5c933
|
Merge branch 'release/flexpowerzones'
|
2017-01-25 21:11:49 +01:00 |
|
Sander Roosendaal
|
1a9d1c19ad
|
changed bands to zones (wording)
|
2017-01-25 21:10:45 +01:00 |
|
Sander Roosendaal
|
58c954f47f
|
fix email settings bug
|
2017-01-25 21:07:24 +01:00 |
|
Sander Roosendaal
|
fd50a9ea4c
|
fixed email sending bug
|
2017-01-25 21:04:31 +01:00 |
|
Sander Roosendaal
|
d8fc9a0392
|
Merge branch 'feature/powerzones' into develop
|
2017-01-25 18:19:04 +01:00 |
|
Sander Roosendaal
|
8b7005b3dc
|
small bug fix
|
2017-01-25 18:18:13 +01:00 |
|
Sander Roosendaal
|
591e515f92
|
initial implementation of Power Zones form
|
2017-01-25 18:07:57 +01:00 |
|
Sander Roosendaal
|
5eed5d05a8
|
defined PowerZonesForm
|
2017-01-25 15:37:26 +01:00 |
|
Sander Roosendaal
|
e4c2270306
|
updated models.py to add powerzones
|
2017-01-24 23:24:57 +01:00 |
|
Sander Roosendaal
|
800934e12a
|
completed cleanup routines
|
2017-01-24 17:01:38 +01:00 |
|
Sander Roosendaal
|
f4108ee40f
|
Merge tag 'ftp' into develop
FTP show power bands
|
2017-01-24 15:58:03 +01:00 |
|
Sander Roosendaal
|
9e82a28c0b
|
Merge branch 'release/ftp'
|
2017-01-24 15:57:43 +01:00 |
|
Sander Roosendaal
|
32ce2ba7ae
|
Merge branch 'feature/ftp' into develop
|
2017-01-24 15:37:23 +01:00 |
|
Sander Roosendaal
|
41f34dd1a5
|
Showing Power band values in Rower edit
|
2017-01-24 15:36:17 +01:00 |
|
Sander Roosendaal
|
50b38641c8
|
factored passwords out of settings.py with yamjam
|
2017-01-24 14:57:31 +01:00 |
|
Sander Roosendaal
|
6597ecd2fa
|
Merge tag 'bcmike' into develop
BoatCoach processing for Mike
|
2017-01-24 12:23:37 +01:00 |
|
Sander Roosendaal
|
dc9802c730
|
Merge branch 'release/bcmike'
|
2017-01-24 12:23:15 +01:00 |
|
Sander Roosendaal
|
29779a2247
|
Processing BoatCoach for Mike
|
2017-01-24 12:13:13 +01:00 |
|
Sander Roosendaal
|
8f83f0db1c
|
Merge tag 'stravaerrors3' into develop
more strava error detection code
|
2017-01-22 21:14:49 +01:00 |
|
Sander Roosendaal
|
20a2fd84d4
|
Merge branch 'release/stravaerrors3'
|
2017-01-22 20:50:43 +01:00 |
|
Sander Roosendaal
|
d04200d1ec
|
some more error detection code
|
2017-01-22 20:35:51 +01:00 |
|
Sander Roosendaal
|
78ea02b9b4
|
Merge tag 'sporttracksduration' into develop
hotfix sporttracks sync workout duration
|
2017-01-17 08:18:38 +01:00 |
|
Sander Roosendaal
|
db56a61315
|
Merge branch 'hotfix/sporttracksduration'
|
2017-01-17 08:17:26 +01:00 |
|
Sander Roosendaal
|
1efcf6fbf6
|
bug fix duration sporttracks sync
|
2017-01-17 08:16:35 +01:00 |
|
Sander Roosendaal
|
a6ffcd845b
|
Merge tag 'rhythm' into develop
Rhythm
|
2017-01-16 22:55:49 +01:00 |
|
Sander Roosendaal
|
752f2a08d5
|
Merge branch 'release/rhythm'
|
2017-01-16 22:55:35 +01:00 |
|
Sander Roosendaal
|
7b0e8e6872
|
added Rhythm to flex plot
|
2017-01-16 22:43:46 +01:00 |
|
Sander Roosendaal
|
c380804d08
|
added pace clipping to C2 import
|
2017-01-16 20:50:54 +01:00 |
|
Sander Roosendaal
|
b0507b8001
|
Merge branch 'feature/cleanup' into develop
|
2017-01-16 17:36:31 +01:00 |
|
Sander Roosendaal
|
ef7cd92415
|
Finishing light comments and cleanup
|
2017-01-16 17:35:39 +01:00 |
|
Sander Roosendaal
|
5f551528da
|
another batch of light comments
|
2017-01-15 16:57:11 +01:00 |
|
Sander Roosendaal
|
e5810dbf62
|
another batch of files with a light sprinkle of comments
|
2017-01-15 16:06:14 +01:00 |
|
Sander Roosendaal
|
737ac5fd3f
|
Completed views.py
|
2017-01-14 15:59:50 +01:00 |
|
Sander Roosendaal
|
d1a3493ee4
|
Merge branch 'feature/c2splits' into develop
|
2017-01-14 14:59:14 +01:00 |
|
Sander Roosendaal
|
cf9ba0851a
|
removed some dead code from ST add strokedata
|
2017-01-14 14:58:26 +01:00 |
|
Sander Roosendaal
|
645e7e3c63
|
set total distance and time to Concept2 data
|
2017-01-14 09:30:00 +01:00 |
|
Sander Roosendaal
|
220bc531dd
|
half way through cleaning up and commenting the code
|
2017-01-13 14:36:05 +01:00 |
|
Sander Roosendaal
|
24364dcfb1
|
moved test files
|
2017-01-12 22:35:00 +01:00 |
|
Sander Roosendaal
|
7626bb788a
|
nothing
|
2017-01-12 22:28:55 +01:00 |
|
Sander Roosendaal
|
c2bc7a71a8
|
Merge tag 'smtp2' into develop
back to mail (from smtp)
|
2017-01-12 22:21:09 +01:00 |
|
Sander Roosendaal
|
910d9677ef
|
Merge branch 'hotfix/smtp2'
|
2017-01-12 22:20:53 +01:00 |
|