Sander Roosendaal
|
de0b4b690f
|
Merge branch 'feature/bikeerg2' into develop
|
2018-08-29 09:57:36 +02:00 |
|
Sander Roosendaal
|
b41f4c77de
|
bike erg export to C2
|
2018-08-29 09:55:02 +02:00 |
|
Sander Roosendaal
|
cadc5d5e0d
|
bike erg import from C2 log
|
2018-08-29 09:46:46 +02:00 |
|
Sander Roosendaal
|
10e989d32d
|
reverted bikeerg conversion in dataprep
|
2018-08-29 09:23:59 +02:00 |
|
Sander Roosendaal
|
219afaa40e
|
defined one p0 in datautils for CP fits
|
2018-08-28 16:37:55 +02:00 |
|
Sander Roosendaal
|
7e29c3b65d
|
Merge tag 'v7.48' into develop
fix
|
2018-08-28 13:28:05 +02:00 |
|
Sander Roosendaal
|
e8aecb155f
|
Merge branch 'release/v7.48'
|
2018-08-28 13:27:37 +02:00 |
|
Sander Roosendaal
|
92806959fc
|
bug fix
|
2018-08-28 13:24:14 +02:00 |
|
Sander Roosendaal
|
fbee615d47
|
Merge tag 'v7.47' into develop
adding OTW cp data to admin
|
2018-08-28 13:19:02 +02:00 |
|
Sander Roosendaal
|
4d6b59d404
|
Merge branch 'release/v7.47'
|
2018-08-28 13:15:16 +02:00 |
|
Sander Roosendaal
|
8caddb72e1
|
added otw version of cp data to admin
|
2018-08-28 13:10:42 +02:00 |
|
Sander Roosendaal
|
27287be369
|
Merge tag 'v7.46' into develop
fix
|
2018-08-28 12:58:39 +02:00 |
|
Sander Roosendaal
|
453a1a2c40
|
Merge branch 'hotfix/v7.46'
|
2018-08-28 12:55:49 +02:00 |
|
Sander Roosendaal
|
9d228391c4
|
fix
|
2018-08-28 12:54:25 +02:00 |
|
Sander Roosendaal
|
4e92296be6
|
Merge tag 'v7.45' into develop
bug fix
|
2018-08-28 12:41:59 +02:00 |
|
Sander Roosendaal
|
aaa9919f4f
|
Merge branch 'hotfix/v7.45'
|
2018-08-28 12:41:14 +02:00 |
|
Sander Roosendaal
|
dc07f7c7cd
|
bug fix
|
2018-08-28 12:39:37 +02:00 |
|
Sander Roosendaal
|
3cba512033
|
Merge tag 'v7.44' into develop
support for bike erg
|
2018-08-28 12:23:46 +02:00 |
|
Sander Roosendaal
|
d58658042d
|
Merge branch 'release/v7.44'
|
2018-08-28 12:16:12 +02:00 |
|
Sander Roosendaal
|
4f5695723b
|
cp data sending to admin
|
2018-08-28 11:59:18 +02:00 |
|
Sander Roosendaal
|
18b8f96418
|
Merge branch 'feature/bikeerg' into develop
|
2018-08-28 09:43:28 +02:00 |
|
Sander Roosendaal
|
92a696a43c
|
export to C2
|
2018-08-28 09:41:35 +02:00 |
|
Sander Roosendaal
|
d85b9ac7f2
|
initial implementation
|
2018-08-27 15:27:01 +02:00 |
|
Sander Roosendaal
|
5243bb4016
|
improved export settings for offline processing
|
2018-08-27 12:39:32 +02:00 |
|
Sander Roosendaal
|
1c3ef2f629
|
Merge tag 'v7.43' into develop
hot fix
|
2018-08-19 18:10:36 +02:00 |
|
Sander Roosendaal
|
2ce0170e27
|
Merge branch 'hotfix/v7.43'
|
2018-08-19 18:09:46 +02:00 |
|
Sander Roosendaal
|
f17b3ec006
|
bug fix
|
2018-08-19 18:06:13 +02:00 |
|
Sander Roosendaal
|
dd7e3facd9
|
Merge tag 'v7.42' into develop
hot fix
|
2018-08-18 13:18:23 +02:00 |
|
Sander Roosendaal
|
7962475af0
|
Merge branch 'hotfix/v7.42'
|
2018-08-18 13:17:42 +02:00 |
|
Sander Roosendaal
|
0140816e7f
|
bug fix in race edit
|
2018-08-18 13:16:00 +02:00 |
|
Sander Roosendaal
|
50860211d1
|
xmlcreate by courses
|
2018-08-17 10:58:01 +02:00 |
|
Sander Roosendaal
|
31d9fe8f00
|
Merge tag 'v7.40' into develop
bug fix
|
2018-08-15 10:55:33 +02:00 |
|
Sander Roosendaal
|
486e9d830f
|
Merge branch 'hotfix/v7.40'
|
2018-08-15 10:53:36 +02:00 |
|
Sander Roosendaal
|
2374b1b0bc
|
added headers key to oauth_settings
|
2018-08-15 10:43:21 +02:00 |
|
Sander Roosendaal
|
1e23354346
|
runkeeper patch & course_time_zone bug fix
|
2018-08-15 10:25:04 +02:00 |
|
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 |
|