Sander Roosendaal
|
64f4e58d5a
|
Merge tag 'v7.39' into develop
hot fix
|
2018-07-30 12:30:26 +02:00 |
|
Sander Roosendaal
|
ad225fcde8
|
Merge branch 'hotfix/v7.39'
|
2018-07-30 11:54:23 +02:00 |
|
Sander Roosendaal
|
7637522bd4
|
hot fix user account delete
|
2018-07-30 11:53:16 +02:00 |
|
Sander Roosendaal
|
a0ef41e2fc
|
added try except in dataprepnodjango
error on dev and production in async task execution
|
2018-07-24 14:13:34 +02:00 |
|
Sander Roosendaal
|
3960a1acc6
|
Merge tag 'v7.38' into develop
bug fixes
|
2018-07-23 09:31:29 +02:00 |
|
Sander Roosendaal
|
bd67cab1f1
|
Merge branch 'hotfix/v7.38'
|
2018-07-23 09:31:08 +02:00 |
|
Sander Roosendaal
|
e70c477f82
|
bug fix strava & image
Detect existing workouts on Strava threw an error
Image upload sometimes gave a KeyError
|
2018-07-23 09:07:25 +02:00 |
|
Sander Roosendaal
|
126064ae4a
|
Merge tag 'v7.37' into develop
bug fix
|
2018-07-19 08:09:45 +02:00 |
|
Sander Roosendaal
|
78cc8b86d5
|
Merge branch 'release/v7.37'
|
2018-07-19 08:08:58 +02:00 |
|
Sander Roosendaal
|
298e973da6
|
adding empty results at start of virtualeventview
|
2018-07-19 08:05:43 +02:00 |
|
Sander Roosendaal
|
43a384484e
|
Merge tag 'v7.36' into develop
bug fix
|
2018-07-17 08:51:54 +02:00 |
|
Sander Roosendaal
|
caee7d93f3
|
Merge branch 'hotfix/v7.36'
|
2018-07-17 08:51:33 +02:00 |
|
Sander Roosendaal
|
fbb5135446
|
strava import all & workout edit page small bug fix
|
2018-07-17 08:13:40 +02:00 |
|
Sander Roosendaal
|
7c63218948
|
Merge tag 'v7.35' into develop
bug fix
|
2018-07-16 17:21:58 +02:00 |
|
Sander Roosendaal
|
0c405eda49
|
Merge branch 'hotfix/v7.35'
|
2018-07-16 17:21:45 +02:00 |
|
Sander Roosendaal
|
bcb6b4512e
|
bug fix
|
2018-07-16 17:20:27 +02:00 |
|
Sander Roosendaal
|
7ff3500cc4
|
strava export as rowing on auto export
|
2018-07-13 09:21:09 +02:00 |
|
Sander Roosendaal
|
3219190f66
|
added at
|
2018-07-12 22:02:31 +02:00 |
|
Sander Roosendaal
|
3e95df4e2a
|
Merge tag 'v7.34' into develop
adding task start date and bug fix
|
2018-07-12 21:53:46 +02:00 |
|
Sander Roosendaal
|
a79f3ca8eb
|
Merge branch 'release/v7.34'
|
2018-07-12 21:52:54 +02:00 |
|
Sander Roosendaal
|
0e70a43a4e
|
adding start date to tasks
|
2018-07-12 21:34:35 +02:00 |
|
Sander Roosendaal
|
d19cbb34d4
|
Merge tag 'v7.33' into develop
bug fix
|
2018-07-12 17:32:07 +02:00 |
|
Sander Roosendaal
|
f15d310a73
|
Merge branch 'hotfix/v7.33'
|
2018-07-12 17:30:45 +02:00 |
|
Sander Roosendaal
|
a44981dda6
|
changing add_efficiency cleaning up columns
|
2018-07-12 16:57:41 +02:00 |
|
Sander Roosendaal
|
12d689ccf7
|
Merge tag 'v7.32' into develop
fixing endless loop bug
|
2018-07-12 16:04:41 +02:00 |
|
Sander Roosendaal
|
323c1e4c0c
|
Merge branch 'release/v7.32'
|
2018-07-12 16:04:18 +02:00 |
|
Sander Roosendaal
|
386d3d947d
|
Merge branch 'bugfix/stats' into develop
|
2018-07-12 15:44:43 +02:00 |
|
Sander Roosendaal
|
2fc2aa2810
|
preventing infinite recursion
|
2018-07-12 15:43:28 +02:00 |
|
Sander Roosendaal
|
d7e117df41
|
Merge branch 'develop' into bugfix/stats
|
2018-07-12 15:12:18 +02:00 |
|
Sander Roosendaal
|
3a5768a500
|
Merge tag 'v7.31' into develop
bug fix
|
2018-07-12 15:07:33 +02:00 |
|
Sander Roosendaal
|
6a3d874ae1
|
Merge branch 'hotfix/v7.31'
|
2018-07-12 15:06:52 +02:00 |
|
Sander Roosendaal
|
d0f928d299
|
catching keyerror as well
|
2018-07-12 15:05:55 +02:00 |
|
Sander Roosendaal
|
b6584795f2
|
more try except in c2stuff - bugfix
|
2018-07-12 15:04:22 +02:00 |
|
Sander Roosendaal
|
eff6110395
|
small update of dataprepnodjango
|
2018-07-12 14:58:36 +02:00 |
|
Sander Roosendaal
|
08125cdd95
|
Merge branch 'develop' into bugfix/stats
|
2018-07-12 13:38:37 +02:00 |
|
Sander Roosendaal
|
2a0194c56c
|
Merge tag 'v7.30' into develop
bug fix c2 import
|
2018-07-12 13:37:51 +02:00 |
|
Sander Roosendaal
|
814556b100
|
Merge branch 'hotfix/v7.30'
|
2018-07-12 13:36:45 +02:00 |
|
Sander Roosendaal
|
3ddac6573a
|
bug fix
|
2018-07-12 12:59:26 +02:00 |
|
Sander Roosendaal
|
290fd656a5
|
Merge branch 'bugfix/notifications' into develop
|
2018-07-12 12:51:05 +02:00 |
|
Sander Roosendaal
|
a9dc9e61f3
|
bugfix
|
2018-07-12 12:49:40 +02:00 |
|
Sander Roosendaal
|
80623af8c5
|
notifications suppressed & some strava checking
|
2018-07-12 12:39:10 +02:00 |
|
Sander Roosendaal
|
9ba187dc8f
|
commit
|
2018-07-11 16:23:19 +02:00 |
|
Sander Roosendaal
|
1ada144b8e
|
Merge tag 'v7.29' into develop
bug fixes, better logout experience
|
2018-07-10 16:00:58 +02:00 |
|
Sander Roosendaal
|
24aef2c92a
|
Merge branch 'release/v7.29'
|
2018-07-10 16:00:34 +02:00 |
|
Sander Roosendaal
|
c5b0351153
|
checking for isfinite in normw, normv calc
|
2018-07-10 14:56:31 +02:00 |
|
Sander Roosendaal
|
08ca7539f2
|
logout redirect improved
|
2018-07-10 14:49:48 +02:00 |
|
Sander Roosendaal
|
d5023f64c5
|
Merge branch 'bugfix/impex' into develop
|
2018-07-10 14:12:09 +02:00 |
|
Sander Roosendaal
|
0a677bcbd8
|
code merge strava import all
|
2018-07-10 14:11:22 +02:00 |
|
Sander Roosendaal
|
2fdcaedc7f
|
fixed bug
|
2018-07-10 12:52:53 +02:00 |
|
Sander Roosendaal
|
0c7e948ee1
|
Merge tag 'v7.28' into develop
bug fixes
|
2018-07-09 18:53:01 +02:00 |
|