Private
Public Access
1
0
Commit Graph

1606 Commits

Author SHA1 Message Date
Sander Roosendaal
789100aa7e Merge branch 'release/v3.65' 2017-08-29 18:54:44 +02:00
Sander Roosendaal
ad730d4049 histo now also OTW 2017-08-29 18:04:10 +02:00
Sander Roosendaal
384ad4871e fixed bug related to split after rowing physics calc 2017-08-29 10:22:38 +02:00
Sander Roosendaal
5bb5f6668b Merge tag 'v3.64' into develop
bug fix histogram form
2017-08-25 08:55:29 +02:00
Sander Roosendaal
f67d25645b Merge branch 'release/v3.64' 2017-08-25 08:54:55 +02:00
Sander Roosendaal
12b820c62b fixed nonetype error days form histo 2017-08-25 08:51:42 +02:00
Sander Roosendaal
0b24b787ad Merge tag 'v3.63' into develop
coxmate logo and comments number
2017-08-24 18:29:03 +02:00
Sander Roosendaal
ac5f0a1e6d Merge branch 'release/v3.63' 2017-08-24 18:28:27 +02:00
Sander Roosendaal
293f44c37f Merge branch 'feature/coxmatelogo' into develop 2017-08-24 18:18:19 +02:00
Sander Roosendaal
90ada3809f added number of comments to workout_view 2017-08-24 18:17:24 +02:00
Sander Roosendaal
dba006892b added coxmate logo 2017-08-24 18:02:54 +02:00
Sander Roosendaal
4a84a2f234 Merge tag 'v3.62' into develop
hotfix workout split
2017-08-24 10:34:38 +02:00
Sander Roosendaal
3886cc94fb Merge branch 'hotfix/v3.62' 2017-08-24 10:31:31 +02:00
Sander Roosendaal
08612aa4ce dataprep 2017-08-24 10:30:39 +02:00
Sander Roosendaal
c46c776884 bug fix and improved split behavior 2017-08-24 09:59:19 +02:00
Sander Roosendaal
dcb4d6d2b8 Merge tag 'v3.61' into develop
workout split
2017-08-23 12:09:50 +02:00
Sander Roosendaal
d09cf4c99c Merge branch 'release/v3.61' 2017-08-23 12:09:14 +02:00
Sander Roosendaal
0af56b6e2f added OTE split 2017-08-23 10:57:27 +02:00
Sander Roosendaal
31b65a26dc Merge branch 'feature/splitworkout' into develop 2017-08-23 10:18:14 +02:00
Sander Roosendaal
45fe8a6181 workout split works 2017-08-23 09:55:26 +02:00
Sander Roosendaal
7e78abc1ef split seems to be working now 2017-08-22 22:28:09 +02:00
Sander Roosendaal
f44fee0f12 split workout (bugs) 2017-08-22 20:15:06 +02:00
Sander Roosendaal
6a65214d48 Merge tag 'v3.60' into develop
added coxmate support
2017-08-21 16:04:11 +02:00
Sander Roosendaal
93895a61c4 Merge branch 'release/v3.60' 2017-08-21 16:03:55 +02:00
Sander Roosendaal
07323ac545 added coxmate support 2017-08-21 12:54:32 +02:00
Sander Roosendaal
5db48401de Merge tag 'v3.59' into develop
map layers
2017-08-12 08:40:41 +02:00
Sander Roosendaal
a76af910f3 Merge branch 'release/v3.59' 2017-08-12 08:40:15 +02:00
Sander Roosendaal
26cf34a537 Merge branch 'feature/mapselection' into develop 2017-08-12 08:37:05 +02:00
Sander Roosendaal
b321ce6d33 fine tuning 2017-08-12 08:35:45 +02:00
Sander Roosendaal
1895ff2098 added outdoor, satellite, openseamap 2017-08-12 08:24:38 +02:00
Sander Roosendaal
eeea67d511 Merge tag 'v3.58' into develop
hotfix datetime naive
2017-08-11 18:13:05 +02:00
Sander Roosendaal
3a866737b5 Merge branch 'hotfix/v3.58' 2017-08-11 18:12:30 +02:00
Sander Roosendaal
f1cef80268 hotfix search (datetime naive date) 2017-08-11 18:11:11 +02:00
Sander Roosendaal
7e99c3e57b Merge tag 'v3.57' into develop
leaflet maps
2017-08-11 17:34:40 +02:00
Sander Roosendaal
64dd85a79a Merge branch 'release/v3.57' 2017-08-11 17:34:11 +02:00
Sander Roosendaal
6d20956981 Merge branch 'feature/leaflet' into develop 2017-08-11 17:25:05 +02:00
Sander Roosendaal
0809788cf1 wind map switched to leaflet 2017-08-11 17:23:13 +02:00
Sander Roosendaal
af7b51ed9c leaflet maps working 2017-08-11 17:18:43 +02:00
Sander Roosendaal
3a51c5c978 leaflet map - path not working 2017-08-11 13:38:24 +02:00
Sander Roosendaal
008e1ac2ee added geoleaflet 2017-08-11 08:20:28 +02:00
Sander Roosendaal
e81e922e97 Merge tag 'v3.56' into develop
hotfix
2017-08-10 18:38:17 +02:00
Sander Roosendaal
a42d7dd07e Merge branch 'hotfix/v3.56' 2017-08-10 18:38:04 +02:00
Sander Roosendaal
635c371987 bug fix on modalities 2017-08-10 18:37:07 +02:00
Sander Roosendaal
2a806a0a0f Merge tag 'v3.55' into develop
boat type selectors everywhere
2017-08-10 15:36:34 +02:00
Sander Roosendaal
0f1a3aa31c Merge branch 'release/v3.55' 2017-08-10 15:35:59 +02:00
Sander Roosendaal
66e0ba8a47 water boattype permanent in cumflex 2017-08-10 14:47:24 +02:00
Sander Roosendaal
93cb755ba5 Merge branch 'feature/trendflexmultimodal' into develop 2017-08-10 14:32:22 +02:00
Sander Roosendaal
22811f1bb2 multi compare added 2017-08-10 14:20:44 +02:00
Sander Roosendaal
0de3bd333c added box plot 2017-08-10 14:10:39 +02:00
Sander Roosendaal
c74b08d966 modality and boat type selection working on multiflex 2017-08-10 13:58:47 +02:00