Private
Public Access
1
0
Commit Graph

1567 Commits

Author SHA1 Message Date
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
Sander Roosendaal
8156034ae1 initial modality form 2017-08-10 09:52:53 +02:00
Sander Roosendaal
ba24ab4e94 return to right page after delete 2017-08-09 17:28:23 +02:00
Sander Roosendaal
8f11f4a539 showing rests strokes if workout only has rest strokes:wq 2017-08-09 14:57:12 +02:00
Sander Roosendaal
79b3826571 made fix_newtons a bit more flexible 2017-08-09 13:17:26 +02:00
Sander Roosendaal
196ffee365 Merge tag 'v3.54' into develop
fix
2017-08-09 11:20:49 +02:00
Sander Roosendaal
b40244b4af Merge branch 'hotfix/v3.54' 2017-08-09 11:20:30 +02:00
Sander Roosendaal
07b4a7a71e fix 2017-08-09 11:19:42 +02:00
Sander Roosendaal
a0a9c54afe Merge tag 'v3.53' into develop
hotfix lbstoN
2017-08-09 11:07:23 +02:00
Sander Roosendaal
a8690afb0c Merge branch 'hotfix/v3.53' 2017-08-09 11:07:01 +02:00
Sander Roosendaal
e586de64e3 hotfix lbstoN 2017-08-09 11:05:41 +02:00
Sander Roosendaal
bd193c5e43 Merge tag 'v3.52' into develop
bug fix dataprepnodjango
2017-08-08 20:57:08 +02:00
Sander Roosendaal
a6d5e636b4 Merge branch 'release/v3.52' 2017-08-08 20:56:13 +02:00
Sander Roosendaal
5d235c5954 added inboard to dataprepnodjango 2017-08-08 20:49:03 +02:00
Sander Roosendaal
497d1dabb3 Merge tag 'v3.51' into develop
improved callouts on trend flex, added efficiency
2017-08-08 13:29:17 +02:00
Sander Roosendaal
0319f1b220 Merge branch 'release/v3.51' 2017-08-08 13:28:37 +02:00
Sander Roosendaal
b59ead6094 Merge branch 'feature/eff_metric' into develop 2017-08-08 12:03:25 +02:00
Sander Roosendaal
fc23750731 corrected work per stroke error (wasn't calculated when it could) 2017-08-08 11:51:41 +02:00
Sander Roosendaal
bd4020d9a9 small changes 2017-08-07 09:50:20 +02:00
Sander Roosendaal
de01ce53c1 correct db in dataprepnodjango 2017-08-07 09:09:38 +02:00
Sander Roosendaal
2e4e6c47e0 added add_effiency and eff calc added to otw_physics 2017-08-07 09:08:56 +02:00
Sander Roosendaal
981075fd68 added boat type selector to stats and flexall 2017-08-04 13:07:59 +02:00
Sander Roosendaal
c55be018d7 added efficiency metric 2017-08-04 11:14:45 +02:00
Sander Roosendaal
e673255f43 improved callout on trend flex 2017-08-04 10:25:49 +02:00
Sander Roosendaal
d7a1cef4e8 Merge tag 'v3.50' into develop
two small fixes
2017-08-02 10:04:34 +02:00
Sander Roosendaal
f39b4e2205 Merge branch 'hotfix/v3.50' 2017-08-02 09:58:41 +02:00
Sander Roosendaal
9d17b6c717 fixed email form 2017-08-02 09:57:23 +02:00
Sander Roosendaal
f95e2415b3 fixed type in strava_callback 2017-08-02 09:50:06 +02:00
Sander Roosendaal
c9aea45e67 Merge tag 'v3.49' into develop
bug fix
2017-07-29 13:18:19 +02:00
Sander Roosendaal
57429f5ee3 Merge branch 'hotfix/v3.49' 2017-07-29 13:17:38 +02:00
Sander Roosendaal
5a5c3508ea no future dates in activity chart 2017-07-29 13:14:18 +02:00
Sander Roosendaal
a200ef91a1 Merge tag 'v3.48' into develop
zip for teams, activity chart, minor updates
2017-07-29 12:50:20 +02:00
Sander Roosendaal
4db523b396 Merge branch 'release/v3.48' 2017-07-29 12:49:55 +02:00
Sander Roosendaal
51e8b888b4 added activity chart 2017-07-29 12:44:23 +02:00
Sander Roosendaal
f04f55334e workouts list gets last 30 days for small graph 2017-07-29 11:14:48 +02:00
Sander Roosendaal
186f6064bd Merge branch 'feature/impeller' into develop 2017-07-29 10:46:25 +02:00
Sander Roosendaal
0e00e583ec removed consistency checks from default at upload 2017-07-29 10:23:10 +02:00
Sander Roosendaal
8073c3922b added trend flex and OTW ranking to team stats 2017-07-29 10:17:48 +02:00
Sander Roosendaal
ad87661755 Merge branch 'feature/deleteteams' into develop 2017-07-25 20:32:32 +02:00
Sander Roosendaal
851c0043da zip processing for team 2017-07-25 20:30:37 +02:00