Private
Public Access
1
0
Commit Graph

2860 Commits

Author SHA1 Message Date
Sander Roosendaal
024a4cc06f Merge tag 'v6.75' into develop
hotfix
2018-05-27 11:13:10 +02:00
Sander Roosendaal
4d40ccbf66 Merge branch 'hotfix/v6.75' 2018-05-27 11:12:51 +02:00
Sander Roosendaal
cfa3d76c28 hotfix 2018-05-27 11:12:02 +02:00
Sander Roosendaal
7ae1e1603a Merge tag 'v6.74' into develop
release
2018-05-27 10:54:01 +02:00
Sander Roosendaal
3818f83cf1 Merge branch 'release/v6.74' 2018-05-27 10:44:56 +02:00
Sander Roosendaal
03745e306e bugfix, plus swapping racing & teams buttons 2018-05-27 10:36:43 +02:00
Sander Roosendaal
b5f0f41b41 two parameters with same name - bug fix 2018-05-27 10:19:54 +02:00
Sander Roosendaal
38b8bc5702 added site announcement + tweet when race created 2018-05-26 21:07:20 +02:00
Sander Roosendaal
3d12ec963a Merge tag 'v6.73' into develop
hotfix
2018-05-19 18:05:14 +02:00
Sander Roosendaal
bd289f4887 Merge branch 'hotfix/v6.73' 2018-05-19 18:04:52 +02:00
Sander Roosendaal
ec1b87865c hotfix paging list-workouts 2018-05-19 18:04:05 +02:00
Sander Roosendaal
2f5e6dd755 Merge tag 'v6.72' into develop
better race submit form
2018-05-19 15:27:45 +02:00
Sander Roosendaal
33ef17685a Merge branch 'release/v6.72' 2018-05-19 15:27:32 +02:00
Sander Roosendaal
4be52e8e25 more robust race form 2018-05-19 14:57:45 +02:00
Sander Roosendaal
ed7ade98aa Merge tag 'v6.71' into develop
releasing some bug fixes
2018-05-18 13:33:55 +02:00
Sander Roosendaal
da6fa702ae Merge branch 'release/v6.71' 2018-05-18 13:33:39 +02:00
Sander Roosendaal
4852e36e31 fixed time zone stuff 2018-05-18 12:58:21 +02:00
Sander Roosendaal
bc77186a01 multi page workout list with startdate/enddate 2018-05-18 12:13:25 +02:00
Sander Roosendaal
c330a237ef Export to MapMyFitness now works 2018-05-18 11:56:40 +02:00
Sander Roosendaal
7abdf92809 Merge tag 'v6.70' into develop
bug fix
2018-05-17 19:56:53 +02:00
Sander Roosendaal
5064fe06b4 Merge branch 'release/v6.70' 2018-05-17 19:56:39 +02:00
Sander Roosendaal
746ac911ab bug fix 2018-05-17 19:55:34 +02:00
Sander Roosendaal
d56103c17a Merge tag 'v6.69' into develop
bugfix
2018-05-17 19:32:05 +02:00
Sander Roosendaal
df24b871f6 Merge branch 'release/v6.69' 2018-05-17 19:30:50 +02:00
Sander Roosendaal
2a0625d356 removed try except on task 2018-05-17 19:07:24 +02:00
Sander Roosendaal
557a07ee42 Merge tag 'v6.68' into develop
async calcs of race results
2018-05-17 18:52:58 +02:00
Sander Roosendaal
18bfe2fbb5 Merge branch 'release/v6.68' 2018-05-17 18:52:44 +02:00
Sander Roosendaal
a0a0b7f260 Merge branch 'feature/submitasync' into develop 2018-05-17 18:20:24 +02:00
Sander Roosendaal
4f8bdf1543 made everything work with async 2018-05-17 18:19:42 +02:00
Sander Roosendaal
b6c67f7e2b submit race result now starts async process 2018-05-17 16:59:19 +02:00
Sander Roosendaal
d2b6c09106 Merge tag 'v6.67' into develop
releasing velo
2018-05-17 13:40:27 +02:00
Sander Roosendaal
e811f23288 Merge branch 'release/v6.67' 2018-05-17 13:39:59 +02:00
Sander Roosendaal
957470c8f9 Merge branch 'feature/addvelo' into develop 2018-05-17 13:38:16 +02:00
Sander Roosendaal
6a50df6bae fixed bokeh bug for workouts with no spm 2018-05-17 13:07:53 +02:00
Sander Roosendaal
0e1155fe60 Merge tag 'v6.66' into develop
improved MapMyFitness support
2018-05-17 12:37:27 +02:00
Sander Roosendaal
9f2560ddde Merge branch 'release/v6.66' 2018-05-17 12:36:02 +02:00
Sander Roosendaal
9fabd6a2e8 bug fix underarmour import 2018-05-17 12:20:06 +02:00
Sander Roosendaal
da918be5d9 Merge branch 'feature/pie' into develop 2018-05-16 17:53:19 +02:00
Sander Roosendaal
d83aaf1203 adding title to pie chart 2018-05-16 17:52:37 +02:00
Sander Roosendaal
5d7aa41a14 adding title to Pie chart 2018-05-16 15:53:28 +02:00
Sander Roosendaal
ce603d343f updated dataprepnodjango 2018-05-15 17:15:23 +02:00
Sander Roosendaal
c2f1df0c87 added velo 2018-05-15 17:13:43 +02:00
Sander Roosendaal
80b821a41d bug fix 2018-05-15 15:10:32 +02:00
Sander Roosendaal
360c0a1a16 Merge tag 'v6.65' into develop
fix for speed
2018-05-15 14:04:18 +02:00
Sander Roosendaal
47af92ff44 Merge branch 'release/v6.65' 2018-05-15 14:03:48 +02:00
Sander Roosendaal
764d1b43aa added course distance to database 2018-05-15 14:02:02 +02:00
Sander Roosendaal
f17b37d235 Merge tag 'v6.64' into develop
releasing popup race related improvements
2018-05-15 13:36:35 +02:00
Sander Roosendaal
a9dc10d6f9 Merge branch 'release/v6.64' 2018-05-15 13:36:18 +02:00
Sander Roosendaal
26b6a6e29c courses defined by spline and other improvements 2018-05-15 10:17:55 +02:00
Sander Roosendaal
9f6d0dc66d Merge branch 'feature/betterdistance' into develop 2018-05-14 21:50:49 +02:00