Private
Public Access
1
0

Commit Graph

  • d6fd7cdb78 Merge tag 'v3.66' into develop Sander Roosendaal 2017-08-31 17:03:21 +02:00
  • fc953dc81f Merge branch 'release/v3.66' Sander Roosendaal 2017-08-31 17:03:01 +02:00
  • 71c0a6f5ff added export as ride Sander Roosendaal 2017-08-31 16:24:05 +02:00
  • 75f50f4de2 Merge tag 'v3.65' into develop Sander Roosendaal 2017-08-29 18:55:22 +02:00
  • 789100aa7e Merge branch 'release/v3.65' Sander Roosendaal 2017-08-29 18:54:44 +02:00
  • ad730d4049 histo now also OTW Sander Roosendaal 2017-08-29 18:04:10 +02:00
  • 384ad4871e fixed bug related to split after rowing physics calc Sander Roosendaal 2017-08-29 10:22:38 +02:00
  • 5bb5f6668b Merge tag 'v3.64' into develop Sander Roosendaal 2017-08-25 08:55:29 +02:00
  • f67d25645b Merge branch 'release/v3.64' Sander Roosendaal 2017-08-25 08:54:55 +02:00
  • 12b820c62b fixed nonetype error days form histo Sander Roosendaal 2017-08-25 08:51:42 +02:00
  • 0b24b787ad Merge tag 'v3.63' into develop Sander Roosendaal 2017-08-24 18:29:03 +02:00
  • ac5f0a1e6d Merge branch 'release/v3.63' Sander Roosendaal 2017-08-24 18:28:27 +02:00
  • 293f44c37f Merge branch 'feature/coxmatelogo' into develop Sander Roosendaal 2017-08-24 18:18:19 +02:00
  • 90ada3809f added number of comments to workout_view Sander Roosendaal 2017-08-24 18:17:24 +02:00
  • dba006892b added coxmate logo Sander Roosendaal 2017-08-24 18:02:54 +02:00
  • 4a84a2f234 Merge tag 'v3.62' into develop Sander Roosendaal 2017-08-24 10:34:38 +02:00
  • 3886cc94fb Merge branch 'hotfix/v3.62' Sander Roosendaal 2017-08-24 10:31:31 +02:00
  • 08612aa4ce dataprep Sander Roosendaal 2017-08-24 10:30:39 +02:00
  • c46c776884 bug fix and improved split behavior Sander Roosendaal 2017-08-24 09:59:19 +02:00
  • dcb4d6d2b8 Merge tag 'v3.61' into develop Sander Roosendaal 2017-08-23 12:09:50 +02:00
  • d09cf4c99c Merge branch 'release/v3.61' Sander Roosendaal 2017-08-23 12:09:14 +02:00
  • 0af56b6e2f added OTE split Sander Roosendaal 2017-08-23 10:57:27 +02:00
  • 31b65a26dc Merge branch 'feature/splitworkout' into develop Sander Roosendaal 2017-08-23 10:18:14 +02:00
  • 45fe8a6181 workout split works Sander Roosendaal 2017-08-23 09:55:26 +02:00
  • 7e78abc1ef split seems to be working now Sander Roosendaal 2017-08-22 22:28:09 +02:00
  • f44fee0f12 split workout (bugs) Sander Roosendaal 2017-08-22 20:15:06 +02:00
  • 6a65214d48 Merge tag 'v3.60' into develop Sander Roosendaal 2017-08-21 16:04:11 +02:00
  • 93895a61c4 Merge branch 'release/v3.60' Sander Roosendaal 2017-08-21 16:03:55 +02:00
  • 07323ac545 added coxmate support Sander Roosendaal 2017-08-21 12:54:32 +02:00
  • 5db48401de Merge tag 'v3.59' into develop Sander Roosendaal 2017-08-12 08:40:41 +02:00
  • a76af910f3 Merge branch 'release/v3.59' Sander Roosendaal 2017-08-12 08:40:15 +02:00
  • 26cf34a537 Merge branch 'feature/mapselection' into develop Sander Roosendaal 2017-08-12 08:37:05 +02:00
  • b321ce6d33 fine tuning Sander Roosendaal 2017-08-12 08:35:45 +02:00
  • 1895ff2098 added outdoor, satellite, openseamap Sander Roosendaal 2017-08-12 08:24:38 +02:00
  • eeea67d511 Merge tag 'v3.58' into develop Sander Roosendaal 2017-08-11 18:13:05 +02:00
  • 3a866737b5 Merge branch 'hotfix/v3.58' Sander Roosendaal 2017-08-11 18:12:30 +02:00
  • f1cef80268 hotfix search (datetime naive date) Sander Roosendaal 2017-08-11 18:11:11 +02:00
  • 7e99c3e57b Merge tag 'v3.57' into develop Sander Roosendaal 2017-08-11 17:34:40 +02:00
  • 64dd85a79a Merge branch 'release/v3.57' Sander Roosendaal 2017-08-11 17:34:11 +02:00
  • 6d20956981 Merge branch 'feature/leaflet' into develop Sander Roosendaal 2017-08-11 17:25:05 +02:00
  • 0809788cf1 wind map switched to leaflet Sander Roosendaal 2017-08-11 17:23:13 +02:00
  • af7b51ed9c leaflet maps working Sander Roosendaal 2017-08-11 17:18:43 +02:00
  • 3a51c5c978 leaflet map - path not working Sander Roosendaal 2017-08-11 13:38:24 +02:00
  • 008e1ac2ee added geoleaflet Sander Roosendaal 2017-08-11 08:20:28 +02:00
  • e81e922e97 Merge tag 'v3.56' into develop Sander Roosendaal 2017-08-10 18:38:17 +02:00
  • a42d7dd07e Merge branch 'hotfix/v3.56' Sander Roosendaal 2017-08-10 18:38:04 +02:00
  • 635c371987 bug fix on modalities Sander Roosendaal 2017-08-10 18:37:07 +02:00
  • 2a806a0a0f Merge tag 'v3.55' into develop Sander Roosendaal 2017-08-10 15:36:34 +02:00
  • 0f1a3aa31c Merge branch 'release/v3.55' Sander Roosendaal 2017-08-10 15:35:59 +02:00
  • 66e0ba8a47 water boattype permanent in cumflex Sander Roosendaal 2017-08-10 14:47:24 +02:00
  • 93cb755ba5 Merge branch 'feature/trendflexmultimodal' into develop Sander Roosendaal 2017-08-10 14:32:22 +02:00
  • 22811f1bb2 multi compare added Sander Roosendaal 2017-08-10 14:20:44 +02:00
  • 0de3bd333c added box plot Sander Roosendaal 2017-08-10 14:10:39 +02:00
  • c74b08d966 modality and boat type selection working on multiflex Sander Roosendaal 2017-08-10 13:58:47 +02:00
  • 8156034ae1 initial modality form Sander Roosendaal 2017-08-10 09:52:53 +02:00
  • ba24ab4e94 return to right page after delete Sander Roosendaal 2017-08-09 17:28:23 +02:00
  • 8f11f4a539 showing rests strokes if workout only has rest strokes:wq Sander Roosendaal 2017-08-09 14:57:12 +02:00
  • 79b3826571 made fix_newtons a bit more flexible Sander Roosendaal 2017-08-09 13:17:26 +02:00
  • 196ffee365 Merge tag 'v3.54' into develop Sander Roosendaal 2017-08-09 11:20:49 +02:00
  • b40244b4af Merge branch 'hotfix/v3.54' Sander Roosendaal 2017-08-09 11:20:30 +02:00
  • 07b4a7a71e fix Sander Roosendaal 2017-08-09 11:19:42 +02:00
  • a0a9c54afe Merge tag 'v3.53' into develop Sander Roosendaal 2017-08-09 11:07:23 +02:00
  • a8690afb0c Merge branch 'hotfix/v3.53' Sander Roosendaal 2017-08-09 11:07:01 +02:00
  • e586de64e3 hotfix lbstoN Sander Roosendaal 2017-08-09 11:05:41 +02:00
  • bd193c5e43 Merge tag 'v3.52' into develop Sander Roosendaal 2017-08-08 20:57:08 +02:00
  • a6d5e636b4 Merge branch 'release/v3.52' Sander Roosendaal 2017-08-08 20:56:13 +02:00
  • 5d235c5954 added inboard to dataprepnodjango Sander Roosendaal 2017-08-08 20:49:03 +02:00
  • 497d1dabb3 Merge tag 'v3.51' into develop Sander Roosendaal 2017-08-08 13:29:17 +02:00
  • 0319f1b220 Merge branch 'release/v3.51' Sander Roosendaal 2017-08-08 13:28:37 +02:00
  • b59ead6094 Merge branch 'feature/eff_metric' into develop Sander Roosendaal 2017-08-08 12:03:25 +02:00
  • fc23750731 corrected work per stroke error (wasn't calculated when it could) Sander Roosendaal 2017-08-08 11:51:41 +02:00
  • bd4020d9a9 small changes Sander Roosendaal 2017-08-07 09:50:20 +02:00
  • de01ce53c1 correct db in dataprepnodjango Sander Roosendaal 2017-08-07 09:09:38 +02:00
  • 2e4e6c47e0 added add_effiency and eff calc added to otw_physics Sander Roosendaal 2017-08-07 09:08:56 +02:00
  • 981075fd68 added boat type selector to stats and flexall Sander Roosendaal 2017-08-04 13:07:59 +02:00
  • c55be018d7 added efficiency metric Sander Roosendaal 2017-08-04 11:14:45 +02:00
  • e673255f43 improved callout on trend flex Sander Roosendaal 2017-08-04 10:25:49 +02:00
  • d7a1cef4e8 Merge tag 'v3.50' into develop Sander Roosendaal 2017-08-02 10:04:34 +02:00
  • f39b4e2205 Merge branch 'hotfix/v3.50' Sander Roosendaal 2017-08-02 09:58:41 +02:00
  • 9d17b6c717 fixed email form Sander Roosendaal 2017-08-02 09:57:23 +02:00
  • f95e2415b3 fixed type in strava_callback Sander Roosendaal 2017-08-02 09:50:06 +02:00
  • c9aea45e67 Merge tag 'v3.49' into develop Sander Roosendaal 2017-07-29 13:18:19 +02:00
  • 57429f5ee3 Merge branch 'hotfix/v3.49' Sander Roosendaal 2017-07-29 13:17:38 +02:00
  • 5a5c3508ea no future dates in activity chart Sander Roosendaal 2017-07-29 13:14:18 +02:00
  • a200ef91a1 Merge tag 'v3.48' into develop Sander Roosendaal 2017-07-29 12:50:20 +02:00
  • 4db523b396 Merge branch 'release/v3.48' Sander Roosendaal 2017-07-29 12:49:55 +02:00
  • 51e8b888b4 added activity chart Sander Roosendaal 2017-07-29 12:44:23 +02:00
  • f04f55334e workouts list gets last 30 days for small graph Sander Roosendaal 2017-07-29 11:14:48 +02:00
  • 186f6064bd Merge branch 'feature/impeller' into develop Sander Roosendaal 2017-07-29 10:46:25 +02:00
  • 0e00e583ec removed consistency checks from default at upload Sander Roosendaal 2017-07-29 10:23:10 +02:00
  • 8073c3922b added trend flex and OTW ranking to team stats Sander Roosendaal 2017-07-29 10:17:48 +02:00
  • ad87661755 Merge branch 'feature/deleteteams' into develop Sander Roosendaal 2017-07-25 20:32:32 +02:00
  • 851c0043da zip processing for team Sander Roosendaal 2017-07-25 20:30:37 +02:00
  • 5036abc94e nothing Sander Roosendaal 2017-07-25 20:08:27 +02:00
  • 9f3bee24d5 Merge tag 'v3.47' into develop Sander Roosendaal 2017-07-13 15:09:01 +02:00
  • c95f1e6eff Merge branch 'hotfix/v3.47' Sander Roosendaal 2017-07-13 15:08:08 +02:00
  • 367777d365 typo in multiflex_select Sander Roosendaal 2017-07-13 15:07:10 +02:00
  • ab6ea96311 Merge tag 'v3.46' into develop Sander Roosendaal 2017-07-11 22:13:20 +02:00
  • bf8a32958a Merge branch 'hotfix/v3.46' Sander Roosendaal 2017-07-11 22:12:56 +02:00
  • a6aca2b2c8 hotfix Sander Roosendaal 2017-07-11 22:11:50 +02:00