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
|
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
|
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 |
|
Sander Roosendaal
|
ec2f5610cf
|
Merge tag 'v2.9' into develop
paypal, bulk import, OTW power slack
|
2017-05-18 19:27:06 +02:00 |
|
Sander Roosendaal
|
4e5b20304d
|
Merge branch 'release/v2.9'
|
2017-05-18 19:25:13 +02:00 |
|
Sander Roosendaal
|
eb9c7ed33f
|
default OTW slack set to 0
|
2017-05-18 18:45:17 +02:00 |
|
Sander Roosendaal
|
40313f9680
|
adding OTW power slack
|
2017-05-18 15:23:09 +02:00 |
|
Sander Roosendaal
|
9578be77c0
|
some small improvement (export messages)
|
2017-05-18 10:19:39 +02:00 |
|
Sander Roosendaal
|
ba38a0747a
|
csv to admin functionality
|
2017-05-17 16:30:05 +02:00 |
|
Sander Roosendaal
|
eb391fec77
|
Merge branch 'feature/c2automatic' into develop
|
2017-05-17 13:35:26 +02:00 |
|
Sander Roosendaal
|
be13626fbc
|
strava done
|
2017-05-17 13:34:01 +02:00 |
|
Sander Roosendaal
|
12d95cfe43
|
C2 and ST button to import all new workouts
|
2017-05-17 11:54:02 +02:00 |
|
Sander Roosendaal
|
bb2283635e
|
bug fix
|
2017-05-17 09:44:47 +02:00 |
|
Sander Roosendaal
|
b7d7d5cc83
|
redirects to boxchart workout picker when ids messed up
|
2017-05-17 09:31:56 +02:00 |
|
Sander Roosendaal
|
791d537b8d
|
added user name to paypal button field
|
2017-05-17 09:02:14 +02:00 |
|
Sander Roosendaal
|
b569fb2c46
|
small improvement
|
2017-05-16 20:23:45 +02:00 |
|
Sander Roosendaal
|
2b61fdea47
|
Merge tag 'v2.86' into develop
bug fix
|
2017-05-16 20:20:10 +02:00 |
|
Sander Roosendaal
|
b025f7515e
|
Merge branch 'release/v2.86'
|
2017-05-16 20:19:07 +02:00 |
|
Sander Roosendaal
|
e1ab50d959
|
bug fix
|
2017-05-16 20:18:03 +02:00 |
|
Sander Roosendaal
|
1973af07a1
|
check rowerplan in checkexpired
|
2017-05-16 20:16:13 +02:00 |
|
Sander Roosendaal
|
c393afdaba
|
Merge tag 'v2.85' into develop
improved filtering box chart
|
2017-05-16 20:07:31 +02:00 |
|
Sander Roosendaal
|
cd03e9326d
|
Merge branch 'release/v2.85'
|
2017-05-16 20:07:12 +02:00 |
|
Sander Roosendaal
|
c0e65a38e9
|
try/except in workout edit save
|
2017-05-16 20:01:08 +02:00 |
|
Sander Roosendaal
|
010f2ac2e3
|
fixed issue 109
|
2017-05-16 18:28:49 +02:00 |
|
Sander Roosendaal
|
8d91cf7b4c
|
added expired user email management command
|
2017-05-16 18:21:55 +02:00 |
|
Sander Roosendaal
|
762a69f926
|
Merge branch 'feature/boxchartsliders' into develop
|
2017-05-16 17:32:04 +02:00 |
|
Sander Roosendaal
|
e04800db2f
|
added tooltip
|
2017-05-16 17:31:04 +02:00 |
|