Sander Roosendaal
|
79d2c7490a
|
Merge tag 'v3.80' into develop
user setting default time zone
|
2017-09-21 13:00:23 +02:00 |
|
Sander Roosendaal
|
ff0a75bdd0
|
Merge branch 'release/v3.80'
|
2017-09-21 10:58:44 +02:00 |
|
Sander Roosendaal
|
43300cc28d
|
added default time zone setting
|
2017-09-21 09:21:33 +02:00 |
|
Sander Roosendaal
|
36249ab4aa
|
Merge tag 'v3.79' into develop
email notifications
|
2017-09-20 17:10:46 +02:00 |
|
Sander Roosendaal
|
4462d00b68
|
Merge branch 'release/v3.79'
|
2017-09-20 17:08:44 +02:00 |
|
Sander Roosendaal
|
64816a1c66
|
added email notification
|
2017-09-20 17:03:45 +02:00 |
|
Sander Roosendaal
|
aea87f6815
|
Merge tag 'v3.78' into develop
added routine to add dps for older workouts
|
2017-09-20 15:51:06 +02:00 |
|
Sander Roosendaal
|
1782ae9372
|
Merge branch 'release/v3.78'
|
2017-09-20 14:54:57 +02:00 |
|
Sander Roosendaal
|
e689955802
|
added calcdps routine
|
2017-09-20 11:18:42 +02:00 |
|
Sander Roosendaal
|
d95ac01172
|
added distance per stroke metric
|
2017-09-19 16:39:58 +02:00 |
|
Sander Roosendaal
|
1fe3ec41e7
|
Merge tag 'v3.77' into develop
date issues & lbs vs N issues fixing
|
2017-09-19 09:53:44 +02:00 |
|
Sander Roosendaal
|
998f523403
|
Merge branch 'release/v3.77'
|
2017-09-19 09:46:39 +02:00 |
|
Sander Roosendaal
|
b3a6d0390f
|
reviewed email notifications
|
2017-09-19 09:25:49 +02:00 |
|
Sander Roosendaal
|
cd19fcd707
|
added TIMEZONE=UTC to settings
|
2017-09-19 08:38:56 +02:00 |
|
Sander Roosendaal
|
2fdaf39537
|
Merge branch 'feature/forcemanagement' into develop
|
2017-09-17 16:00:52 +02:00 |
|
Sander Roosendaal
|
ffea92278e
|
added lbs/N force unit to model, use that
|
2017-09-17 15:58:36 +02:00 |
|
Sander Roosendaal
|
8ccc8dd3a0
|
tested split and flexchart
|
2017-09-17 15:40:52 +02:00 |
|
Sander Roosendaal
|
d38512a47c
|
first pass - untested
|
2017-09-17 15:01:07 +02:00 |
|
Sander Roosendaal
|
5dbb0145fc
|
Merge branch 'develop' into feature/forcemanagement
|
2017-09-17 14:38:45 +02:00 |
|
Sander Roosendaal
|
79474f79b9
|
Merge tag '3.76' into develop
mapview bug fix
|
2017-09-17 14:36:39 +02:00 |
|
Sander Roosendaal
|
3d49b933c9
|
Merge branch 'hotfix/3.76'
|
2017-09-17 14:36:15 +02:00 |
|
Sander Roosendaal
|
9496d20e21
|
fixed map view if no coordinates bug
|
2017-09-17 14:35:02 +02:00 |
|
Sander Roosendaal
|
55049532e4
|
bugfix
|
2017-09-15 15:34:30 +02:00 |
|
Sander Roosendaal
|
7d6e778625
|
dataprep partially done - continue on line 1400
|
2017-09-15 15:31:13 +02:00 |
|
Sander Roosendaal
|
89e843bd34
|
added field forceunit to workout
|
2017-09-15 15:11:07 +02:00 |
|
Sander Roosendaal
|
8fa1be43e8
|
Merge tag 'v3.75' into develop
improved maps
|
2017-09-14 18:10:05 +02:00 |
|
Sander Roosendaal
|
60984db0a2
|
Merge branch 'release/v3.75'
|
2017-09-14 18:07:46 +02:00 |
|
Sander Roosendaal
|
b10aa1ba30
|
added a large map view
|
2017-09-14 17:56:58 +02:00 |
|
Sander Roosendaal
|
5ba36ab0a5
|
Merge tag 'v3.74' into develop
some error checking
|
2017-09-14 17:32:44 +02:00 |
|
Sander Roosendaal
|
8414da5579
|
Merge branch 'hotfix/v3.74'
|
2017-09-14 17:29:32 +02:00 |
|
Sander Roosendaal
|
f1a05db1e4
|
some bug fixing for invalid TCX files
|
2017-09-14 17:25:26 +02:00 |
|
Sander Roosendaal
|
3622e4c1c9
|
Merge tag 'v3.73' into develop
test navionics
|
2017-09-12 16:05:53 +02:00 |
|
Sander Roosendaal
|
91547b1af0
|
Merge branch 'release/v3.73'
|
2017-09-12 16:05:34 +02:00 |
|
Sander Roosendaal
|
ca65f20925
|
navionics transparent test
|
2017-09-12 16:03:12 +02:00 |
|
Sander Roosendaal
|
a89298d3bb
|
Merge tag 'v3.72' into develop
navionics non transparent experiment
|
2017-09-12 15:58:53 +02:00 |
|
Sander Roosendaal
|
856c61e2a4
|
Merge branch 'release/v3.72'
|
2017-09-12 15:58:31 +02:00 |
|
Sander Roosendaal
|
b13909b643
|
removed zindex, made nontransparent
|
2017-09-12 15:56:36 +02:00 |
|
Sander Roosendaal
|
9a6139a228
|
Merge tag 'v3.71' into develop
changed zIndex navionics overlay
|
2017-09-12 15:53:26 +02:00 |
|
Sander Roosendaal
|
9e36f91074
|
Merge branch 'release/v3.71'
|
2017-09-12 15:53:05 +02:00 |
|
Sander Roosendaal
|
4a648b0009
|
changed z index
|
2017-09-12 15:50:38 +02:00 |
|
Sander Roosendaal
|
b6a3f9d2bb
|
Merge tag 'v3.70' into develop
collectstatic tz detect
|
2017-09-12 15:44:58 +02:00 |
|
Sander Roosendaal
|
3a8595d500
|
Merge branch 'release/v3.70'
|
2017-09-12 15:44:43 +02:00 |
|
Sander Roosendaal
|
07abed4de9
|
collectstatic
|
2017-09-12 15:37:32 +02:00 |
|
Sander Roosendaal
|
9109af9de2
|
added tzdetect js files
|
2017-09-12 15:25:16 +02:00 |
|
Sander Roosendaal
|
65dcf29582
|
Merge tag 'v3.69' into develop
time zone support improved, navionics trial
|
2017-09-12 11:55:23 +02:00 |
|
Sander Roosendaal
|
84e8cf782e
|
Merge branch 'release/v3.69'
|
2017-09-12 11:54:19 +02:00 |
|
Sander Roosendaal
|
53512aab47
|
Merge tag 'v3.68' into develop
fixed stravauploadw bug
|
2017-09-12 11:36:46 +02:00 |
|
Sander Roosendaal
|
7ab7daf7f1
|
Merge branch 'hotfix/v3.68'
|
2017-09-12 11:34:52 +02:00 |
|
Sander Roosendaal
|
734b2631f1
|
added test if gz file exists + repair - strave export
|
2017-09-12 08:52:41 +02:00 |
|
Sander Roosendaal
|
452ce2a010
|
Merge branch 'feature/navionics' into develop
|
2017-09-04 14:57:09 +02:00 |
|