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 |
|
Sander Roosendaal
|
4658e241a4
|
filtering working
|
2017-05-16 17:17:15 +02:00 |
|
Sander Roosendaal
|
00cd6299fd
|
Merge tag 'v2.84' into develop
stats page for workouts without HR
|
2017-05-16 12:55:52 +02:00 |
|
Sander Roosendaal
|
d01f9c4391
|
Merge branch 'hotfix/v2.84'
|
2017-05-16 12:51:12 +02:00 |
|
Sander Roosendaal
|
1f04adbf16
|
bug fix
|
2017-05-16 12:49:39 +02:00 |
|
Sander Roosendaal
|
b3017a900e
|
Merge tag 'v2.83' into develop
bug fixes & title for box chart
|
2017-05-16 10:44:31 +02:00 |
|
Sander Roosendaal
|
5fa98ebf5b
|
Merge branch 'release/v2.83'
|
2017-05-16 10:42:42 +02:00 |
|
Sander Roosendaal
|
f0a35aa8c0
|
fixed a few bgs
|
2017-05-16 10:10:43 +02:00 |
|
Sander Roosendaal
|
e8e7312fb6
|
added title to box plot
|
2017-05-15 21:17:17 +02:00 |
|
Sander Roosendaal
|
d4c16f2c1a
|
Merge tag 'v2.82' into develop
bug fix
|
2017-05-15 20:56:54 +02:00 |
|
Sander Roosendaal
|
f7d0014340
|
Merge branch 'hotfix/v2.82'
|
2017-05-15 20:56:36 +02:00 |
|
Sander Roosendaal
|
8e2d811485
|
date and user stable with search
|
2017-05-15 20:55:30 +02:00 |
|
Sander Roosendaal
|
981b111946
|
Merge tag 'v2.81' into develop
team stats
|
2017-05-15 20:35:23 +02:00 |
|
Sander Roosendaal
|
69a18b6ef7
|
Merge branch 'release/v2.81'
|
2017-05-15 20:33:36 +02:00 |
|
Sander Roosendaal
|
a3e61ec215
|
team stats page
|
2017-05-15 20:22:15 +02:00 |
|
Sander Roosendaal
|
1530cdaa61
|
rower switcher on stats pages
|
2017-05-15 14:54:34 +02:00 |
|
Sander Roosendaal
|
be02fe4fbc
|
Merge branch 'feature/tpsync' into develop
|
2017-05-15 09:51:15 +02:00 |
|
Sander Roosendaal
|
38fa4ad87f
|
flex charts sliders for non-empower
|
2017-05-15 09:50:28 +02:00 |
|
Sander Roosendaal
|
3b3bb845d9
|
fix no power * driveenergy sliders
|
2017-05-15 09:48:28 +02:00 |
|