Private
Public Access
1
0
Commit Graph

1318 Commits

Author SHA1 Message Date
Sander Roosendaal
10d94e1256 Merge branch 'release/v3.05' 2017-05-30 10:39:00 +02:00
Sander Roosendaal
6eaa594875 getting coordinates right on fusion 2017-05-30 09:23:27 +02:00
Sander Roosendaal
061b9b74f9 Merge tag 'v3.04' into develop
fusion update and bug fixes
2017-05-26 13:40:06 +02:00
Sander Roosendaal
46d23004b9 Merge branch 'release/v3.04' 2017-05-26 13:39:42 +02:00
Sander Roosendaal
b408129b68 added unduplication 2017-05-25 17:20:52 +02:00
Sander Roosendaal
ec98878c55 Merge tag 'v3.03' into develop
bugfix strava upload
2017-05-24 06:07:46 +02:00
Sander Roosendaal
960b148149 Merge branch 'hotfix/v3.03' 2017-05-24 06:06:32 +02:00
Sander Roosendaal
3e40c0da10 strava upload fix 2017-05-24 06:02:40 +02:00
Sander Roosendaal
b2d8481d9d Merge tag 'v3.02' into develop
hotfix drive energy
2017-05-23 22:12:29 +02:00
Sander Roosendaal
f545f25113 Merge branch 'hotfix/v3.02' 2017-05-23 22:10:33 +02:00
Sander Roosendaal
eea087f4ee bug fix 2017-05-23 22:05:25 +02:00
Sander Roosendaal
ce6e0cc375 Merge tag 'v3.01' into develop
bug fix drivelength flex plot
2017-05-23 20:25:04 +02:00
Sander Roosendaal
f6070e985f Merge branch 'hotfix/v3.01' 2017-05-23 20:24:37 +02:00
Sander Roosendaal
e1f9378107 bugfix drive length 2017-05-23 20:19:11 +02:00
Sander Roosendaal
1acad5dbf1 fixed tuple in notes 2017-05-23 17:12:32 +02:00
Sander Roosendaal
4b4d726a34 Merge tag 'v3.00' into develop
catch workouts without time
2017-05-23 09:21:38 +02:00
Sander Roosendaal
83c6cecdd9 Merge branch 'hotfix/v3.00' 2017-05-23 09:21:19 +02:00
Sander Roosendaal
a50041cc92 return controlled error for data without time data 2017-05-23 09:13:52 +02:00
Sander Roosendaal
cb41e1c9ee Merge tag 'v2.99' into develop
bugfix NoneType notes
2017-05-22 20:50:51 +02:00
Sander Roosendaal
60e868c040 Merge branch 'hotfix/v2.99' 2017-05-22 20:49:42 +02:00
Sander Roosendaal
b0e7ab2cb9 correction for None notes everywhere 2017-05-22 20:42:45 +02:00
Sander Roosendaal
ade8787944 Merge tag 'v2.98' into develop
strava fix
2017-05-22 20:14:41 +02:00
Sander Roosendaal
dd43805c08 Merge branch 'hotfix/v2.98' 2017-05-22 20:14:24 +02:00
Sander Roosendaal
969077fe22 fixed strava export bug 2017-05-22 20:13:17 +02:00
Sander Roosendaal
260399bf49 Merge tag 'v2.97' into develop
removed strava error catching
2017-05-22 15:17:21 +02:00
Sander Roosendaal
0ef6840d22 Merge branch 'hotfix/v2.97' 2017-05-22 15:16:55 +02:00
Sander Roosendaal
d25d41d496 switched off error catching in stravaworkoutdata 2017-05-22 15:15:44 +02:00
Sander Roosendaal
cad864df1d Merge tag 'v2.96' into develop
bug fix
2017-05-22 15:03:04 +02:00
Sander Roosendaal
f735d6a18c Merge branch 'release/v2.96' 2017-05-22 15:02:52 +02:00
Sander Roosendaal
591c7a0764 fixed double deletion 2017-05-22 14:50:29 +02:00
Sander Roosendaal
dfeea93e2d Merge tag 'v2.95' into develop
some more elaborate strava error reporting
2017-05-22 14:30:46 +02:00
Sander Roosendaal
ad1990728f Merge branch 'release/v2.95' 2017-05-22 14:29:26 +02:00
Sander Roosendaal
0a19812c1d Merge branch 'bugfix/stravaexport' into develop 2017-05-22 14:23:05 +02:00
Sander Roosendaal
753f4a5b9a removed print statement 2017-05-22 14:22:24 +02:00
Sander Roosendaal
b3564313dd strava upload improvements 2017-05-22 14:19:43 +02:00
Sander Roosendaal
15ac9e7815 Merge tag 'v2.94' into develop
hotfix flexall
2017-05-22 08:27:25 +02:00
Sander Roosendaal
400c61929c Merge branch 'hotfix/v2.94' 2017-05-22 08:26:11 +02:00
Sander Roosendaal
b14526771c fix 2017-05-22 08:25:27 +02:00
Sander Roosendaal
99f3ad968d hotfix flexall 2017-05-22 07:33:46 +02:00
Sander Roosendaal
3bf512179c solved losing Empower data 2017-05-19 13:27:09 +02:00
Sander Roosendaal
a84ddf73d9 Merge tag 'v2.93' into develop
messages error hotfix
2017-05-18 21:43:52 +02:00
Sander Roosendaal
a32dcdccb4 Merge branch 'hotfix/v2.93' 2017-05-18 21:43:14 +02:00
Sander Roosendaal
3afc1c642e fixed incorrect messages.error call 2017-05-18 21:42:00 +02:00
Sander Roosendaal
cf1c80b68e Merge tag 'v2.92' into develop
FIT from C2
2017-05-18 20:42:57 +02:00
Sander Roosendaal
d00bfaff52 Merge branch 'release/v2.92' 2017-05-18 20:42:24 +02:00
Sander Roosendaal
da2066cfd1 FIT from C2 2017-05-18 20:38:51 +02:00
Sander Roosendaal
e0f8678eda Merge tag 'v2.91' into develop
hotfix SportTracks export message
2017-05-18 20:11:15 +02:00
Sander Roosendaal
409654e594 Merge branch 'hotfix/v2.91' 2017-05-18 20:07:47 +02:00
Sander Roosendaal
0660d954db hotfix message on SportTracks export 2017-05-18 20:06:40 +02:00
Sander Roosendaal
1d9dd56951 added str2bool for workstrokesonly 2017-05-18 19:55:35 +02:00