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 |
|
Sander Roosendaal
|
1e25a29819
|
Merge branch 'hotfix/v7.28'
|
2018-07-09 18:52:45 +02:00 |
|
Sander Roosendaal
|
ebefc67492
|
bug fixes
|
2018-07-09 18:36:56 +02:00 |
|
Sander Roosendaal
|
c861618389
|
Merge tag 'v7.27' into develop
repairing trainingpeaks sync
|
2018-07-09 06:41:29 +02:00 |
|
Sander Roosendaal
|
d83e8b58ce
|
Merge branch 'release/v7.27'
|
2018-07-09 06:41:06 +02:00 |
|
Sander Roosendaal
|
5fed54097d
|
repaired TrainingPeaks
|
2018-07-09 06:21:34 +02:00 |
|
Sander Roosendaal
|
2d84fd6cd0
|
bug fixes import export
|
2018-07-09 05:52:28 +02:00 |
|
Sander Roosendaal
|
e63c58a687
|
Merge tag 'v7.26' into develop
bug fix trimp
|
2018-07-08 21:36:35 +02:00 |
|
Sander Roosendaal
|
b8f85a916f
|
Merge branch 'release/v7.26'
|
2018-07-08 21:36:02 +02:00 |
|
Sander Roosendaal
|
b964a728d8
|
removed some print statements
|
2018-07-08 21:35:05 +02:00 |
|
Sander Roosendaal
|
7b7171ca0f
|
bug fix in trimp calc
|
2018-07-08 21:34:03 +02:00 |
|
Sander Roosendaal
|
d43f0e27af
|
Merge tag 'v7.25' into develop
bug fix
|
2018-07-08 21:16:18 +02:00 |
|
Sander Roosendaal
|
e14aed92c9
|
Merge branch 'release/v7.25'
|
2018-07-08 21:15:41 +02:00 |
|
Sander Roosendaal
|
a3c6d72d0b
|
fix token refresh bug
|
2018-07-08 21:13:34 +02:00 |
|
Sander Roosendaal
|
5b42e13ba0
|
bug fix tp_open
|
2018-07-08 20:11:23 +02:00 |
|
Sander Roosendaal
|
81c8dff8a0
|
Merge tag 'v7.24' into develop
bug fix
|
2018-07-08 12:10:41 +02:00 |
|
Sander Roosendaal
|
f5fb1ef419
|
Merge branch 'hotfix/v7.24'
|
2018-07-08 12:10:16 +02:00 |
|
Sander Roosendaal
|
d01334977e
|
bug fix
|
2018-07-08 12:09:01 +02:00 |
|
Sander Roosendaal
|
e2b6c22bfd
|
Merge tag 'v7.23' into develop
hotfix
|
2018-07-08 12:05:58 +02:00 |
|
Sander Roosendaal
|
2e70a51a49
|
Merge branch 'hotfix/v7.23'
|
2018-07-08 12:05:18 +02:00 |
|
Sander Roosendaal
|
2e8f4aed6c
|
isprorower
|
2018-07-08 12:04:25 +02:00 |
|
Sander Roosendaal
|
08269d17e2
|
Merge tag 'v7.22' into develop
hot fix sporttracks export
|
2018-07-08 11:55:43 +02:00 |
|
Sander Roosendaal
|
a98aba9fe9
|
Merge branch 'release/v7.22'
|
2018-07-08 11:55:02 +02:00 |
|
Sander Roosendaal
|
8d3bcde04a
|
sporttracks export fix
|
2018-07-08 11:38:18 +02:00 |
|
Sander Roosendaal
|
bda37d04c3
|
Merge tag 'v7.21' into develop
hotfix strava export
|
2018-07-08 09:53:26 +02:00 |
|
Sander Roosendaal
|
3ad74201e5
|
Merge branch 'hotfix/v7.21'
|
2018-07-08 09:52:38 +02:00 |
|
Sander Roosendaal
|
6b212eaaf0
|
hotfix
|
2018-07-08 09:51:33 +02:00 |
|
Sander Roosendaal
|
989e1c5ad6
|
Merge tag 'v7.20' into develop
repairing strava export
|
2018-07-08 09:38:28 +02:00 |
|
Sander Roosendaal
|
574b81207c
|
Merge branch 'hotfix/v7.20'
|
2018-07-08 09:37:24 +02:00 |
|
Sander Roosendaal
|
203e0c470f
|
hotfix
|
2018-07-08 09:36:11 +02:00 |
|
Sander Roosendaal
|
f444d2d4cf
|
Merge tag 'v7.19' into develop
bug fix
|
2018-07-07 21:02:17 +02:00 |
|
Sander Roosendaal
|
da08501f4d
|
Merge branch 'hotfix/v7.19'
|
2018-07-07 21:01:54 +02:00 |
|
Sander Roosendaal
|
b3a85b20d8
|
bug fix
|
2018-07-07 21:00:48 +02:00 |
|
Sander Roosendaal
|
27023dee39
|
Merge tag 'v7.18' into develop
tss and other calcs offline
|
2018-07-07 20:19:11 +02:00 |
|