Private
Public Access
1
0
Commit Graph

463 Commits

Author SHA1 Message Date
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
Sander Roosendaal
948ad31b02 back to mail (from smtp) 2017-01-12 22:20:16 +01:00
Sander Roosendaal
dc5461c105 Merge tag 'smtp' into develop
changed mail to smtp
2017-01-12 22:05:35 +01:00
Sander Roosendaal
e0575b04ab Merge branch 'hotfix/smtp' 2017-01-12 22:01:11 +01:00
Sander Roosendaal
1344477d1a email mail -> smtp 2017-01-12 22:00:39 +01:00
Sander Roosendaal
6fdd17e278 Merge branch 'feature/smtp' into develop 2017-01-12 21:56:45 +01:00
Sander Roosendaal
e625b1a553 mail -> smtp 2017-01-12 21:55:53 +01:00
Sander Roosendaal
9ead3e09ec Merge tag 'c2error' into develop
strava/sporttracks warning for no data
2017-01-12 21:39:32 +01:00
Sander Roosendaal
155b52151b Merge branch 'hotfix/c2error' 2017-01-12 21:38:11 +01:00
Sander Roosendaal
3e4a5c060d sporttracks and strava warning when no data 2017-01-12 21:37:14 +01:00
Sander Roosendaal
7fbde744ab changed mail server to smtp.rosti.cz. not tested 2017-01-12 12:16:26 +01:00
Sander Roosendaal
f159da1b0a some fine tuning 2017-01-11 15:27:46 +01:00
Sander Roosendaal
85ef4d08a3 expanded data cleaning command 2017-01-11 15:14:31 +01:00
Sander Roosendaal
6f4bb7d1b2 commented out file.close 2017-01-11 13:16:59 +01:00
Sander Roosendaal
a4d4836cfe Merge tag 'c2importfix' into develop
bugfix C2 import
2017-01-11 10:00:57 +01:00
Sander Roosendaal
aaa687aa9e Merge branch 'hotfix/c2importfix' 2017-01-11 10:00:45 +01:00
Sander Roosendaal
68c75aec9b hotfix no 'workout' field in data c2import 2017-01-11 09:59:44 +01:00
Sander Roosendaal
1eff1bb72c Merge branch 'feature/c2splits2' into develop 2017-01-10 17:25:17 +01:00