Private
Public Access
1
0
Commit Graph

1542 Commits

Author SHA1 Message Date
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
Sander Roosendaal
5036abc94e nothing 2017-07-25 20:08:27 +02:00
Sander Roosendaal
9f3bee24d5 Merge tag 'v3.47' into develop
typo bug fix
2017-07-13 15:09:01 +02:00
Sander Roosendaal
c95f1e6eff Merge branch 'hotfix/v3.47' 2017-07-13 15:08:08 +02:00
Sander Roosendaal
367777d365 typo in multiflex_select 2017-07-13 15:07:10 +02:00
Sander Roosendaal
ab6ea96311 Merge tag 'v3.46' into develop
hotfix criteria multiflex range
2017-07-11 22:13:20 +02:00
Sander Roosendaal
bf8a32958a Merge branch 'hotfix/v3.46' 2017-07-11 22:12:56 +02:00
Sander Roosendaal
a6aca2b2c8 hotfix 2017-07-11 22:11:50 +02:00
Sander Roosendaal
7bb758d488 Merge tag 'v3.45' into develop
multiflex ranges improved
2017-07-11 22:01:19 +02:00
Sander Roosendaal
c5093259c6 Merge branch 'release/v3.45' 2017-07-11 22:00:22 +02:00
Sander Roosendaal
f2dbaf358d ranges for multiflex 2017-07-11 21:57:04 +02:00
Sander Roosendaal
c1cb73232b Merge branch 'feature/stickypalette' into develop 2017-07-11 20:54:59 +02:00
Sander Roosendaal
cc170c4847 multiflex select form remembers options 2017-07-11 20:53:33 +02:00
Sander Roosendaal
ee87f512d7 sticky palette 2017-07-11 20:47:49 +02:00
Sander Roosendaal
69df45143c Merge tag 'v3.44' into develop
hotfix
2017-07-11 20:24:37 +02:00
Sander Roosendaal
1c91df79b3 Merge branch 'hotfix/v3.44' 2017-07-11 20:23:56 +02:00
Sander Roosendaal
9c67a0cad1 keyerror test multiflex 2017-07-11 20:22:54 +02:00
Sander Roosendaal
41c8df384d Merge tag 'v3.43' into develop
color palettes for multi flex
2017-07-11 15:52:56 +02:00
Sander Roosendaal
33107df7d3 Merge branch 'release/v3.43' 2017-07-11 15:52:39 +02:00
Sander Roosendaal
bb6609492b Merge branch 'feature/multiflexcolors' into develop 2017-07-11 15:49:57 +02:00
Sander Roosendaal
7b99fe8cb1 palette picker multiflex 2017-07-11 15:48:19 +02:00
Sander Roosendaal
ab8627e311 legend 2017-07-11 14:11:15 +02:00
Sander Roosendaal
447c833fa7 blue single hue color scheme 2017-07-11 11:13:17 +02:00
Sander Roosendaal
5105834873 more color scheme 2017-07-10 18:43:52 +02:00
Sander Roosendaal
42578702ba color scheme exploration 2017-07-10 18:43:16 +02:00
Sander Roosendaal
7d6f3f7e06 Merge tag 'v3.42' into develop
multiflex colors
2017-07-09 21:19:09 +02:00