Private
Public Access
1
0

Commit Graph

  • b964a728d8 removed some print statements Sander Roosendaal 2018-07-08 21:35:05 +02:00
  • 7b7171ca0f bug fix in trimp calc Sander Roosendaal 2018-07-08 21:34:03 +02:00
  • d43f0e27af Merge tag 'v7.25' into develop Sander Roosendaal 2018-07-08 21:16:18 +02:00
  • e14aed92c9 Merge branch 'release/v7.25' Sander Roosendaal 2018-07-08 21:15:41 +02:00
  • a3c6d72d0b fix token refresh bug Sander Roosendaal 2018-07-08 21:13:34 +02:00
  • 5b42e13ba0 bug fix tp_open Sander Roosendaal 2018-07-08 20:11:23 +02:00
  • 81c8dff8a0 Merge tag 'v7.24' into develop Sander Roosendaal 2018-07-08 12:10:41 +02:00
  • f5fb1ef419 Merge branch 'hotfix/v7.24' Sander Roosendaal 2018-07-08 12:10:16 +02:00
  • d01334977e bug fix Sander Roosendaal 2018-07-08 12:09:01 +02:00
  • e2b6c22bfd Merge tag 'v7.23' into develop Sander Roosendaal 2018-07-08 12:05:58 +02:00
  • 2e70a51a49 Merge branch 'hotfix/v7.23' Sander Roosendaal 2018-07-08 12:05:18 +02:00
  • 2e8f4aed6c isprorower Sander Roosendaal 2018-07-08 12:04:25 +02:00
  • 08269d17e2 Merge tag 'v7.22' into develop Sander Roosendaal 2018-07-08 11:55:43 +02:00
  • a98aba9fe9 Merge branch 'release/v7.22' Sander Roosendaal 2018-07-08 11:55:02 +02:00
  • 8d3bcde04a sporttracks export fix Sander Roosendaal 2018-07-08 11:38:18 +02:00
  • bda37d04c3 Merge tag 'v7.21' into develop Sander Roosendaal 2018-07-08 09:53:26 +02:00
  • 3ad74201e5 Merge branch 'hotfix/v7.21' Sander Roosendaal 2018-07-08 09:52:38 +02:00
  • 6b212eaaf0 hotfix Sander Roosendaal 2018-07-08 09:51:33 +02:00
  • 989e1c5ad6 Merge tag 'v7.20' into develop Sander Roosendaal 2018-07-08 09:38:28 +02:00
  • 574b81207c Merge branch 'hotfix/v7.20' Sander Roosendaal 2018-07-08 09:37:24 +02:00
  • 203e0c470f hotfix Sander Roosendaal 2018-07-08 09:36:11 +02:00
  • f444d2d4cf Merge tag 'v7.19' into develop Sander Roosendaal 2018-07-07 21:02:17 +02:00
  • da08501f4d Merge branch 'hotfix/v7.19' Sander Roosendaal 2018-07-07 21:01:54 +02:00
  • b3a85b20d8 bug fix Sander Roosendaal 2018-07-07 21:00:48 +02:00
  • 27023dee39 Merge tag 'v7.18' into develop Sander Roosendaal 2018-07-07 20:19:11 +02:00
  • a524250dee Merge branch 'release/v7.18' Sander Roosendaal 2018-07-07 20:18:05 +02:00
  • 0dc84b44b0 typo fix Sander Roosendaal 2018-07-07 16:37:17 +02:00
  • f2f9718302 added plan to admin Sander Roosendaal 2018-07-07 16:18:55 +02:00
  • 75d5db185f small fixes Sander Roosendaal 2018-07-07 16:13:19 +02:00
  • d1ddb9b242 removed duplicate import json entry Sander Roosendaal 2018-07-07 08:51:48 +02:00
  • f17bbbb048 Merge tag 'v7.17' into develop Sander Roosendaal 2018-07-07 08:49:53 +02:00
  • 63a5af74dd Merge branch 'hotfix/v7.17' Sander Roosendaal 2018-07-07 08:48:05 +02:00
  • c018a726ea added import json to utils - bug fix Sander Roosendaal 2018-07-07 08:46:48 +02:00
  • b9d43c7536 trimp, tss, hrtss, normv, normw pre-calculated Sander Roosendaal 2018-07-06 18:06:04 +02:00
  • b1537bad88 Merge tag 'v7.16' into develop Sander Roosendaal 2018-07-06 16:35:01 +02:00
  • 85be903eb8 Merge branch 'hotfix/v7.16' Sander Roosendaal 2018-07-06 16:34:52 +02:00
  • f003b353ec bugfix - added check for zerodivisionerror Sander Roosendaal 2018-07-06 16:34:02 +02:00
  • e544d5844b bug fix typo user is auth Sander Roosendaal 2018-07-06 16:29:18 +02:00
  • 45bf58673e Merge branch 'feature/revisedimports' into develop Sander Roosendaal 2018-07-04 17:18:05 +02:00
  • 07d6ec554b bla Sander Roosendaal 2018-07-04 17:17:25 +02:00
  • 101ab007fb removed invalid file Sander Roosendaal 2018-07-04 16:58:10 +02:00
  • 5960c276a8 Merge branch 'develop' into feature/revisedimports Sander Roosendaal 2018-07-04 16:35:29 +02:00
  • 6723194a30 using imports.py on all external APIs Sander Roosendaal 2018-07-04 16:29:01 +02:00
  • 45a6300c76 under armour & trainingpeaks done Sander Roosendaal 2018-07-04 13:30:30 +02:00
  • 8da86e610d done runkeeper Sander Roosendaal 2018-07-03 22:01:53 +02:00
  • ce53c29fee c2, strava done, almost done st Sander Roosendaal 2018-07-03 17:02:45 +02:00
  • f1d3326a2d Merge tag 'v7.15' into develop Sander Roosendaal 2018-07-03 08:28:22 +02:00
  • 5dec4db71e Merge branch 'hotfix/v7.15' Sander Roosendaal 2018-07-03 08:28:06 +02:00
  • 2ac5f8ac43 fixing bug for imports Sander Roosendaal 2018-07-03 08:17:03 +02:00
  • 3421d1a685 strava done Sander Roosendaal 2018-07-02 23:15:21 +02:00
  • afb58ef6e4 added first strava test Sander Roosendaal 2018-07-01 22:34:34 +02:00
  • 977a2da0f8 some comments to clarify prepped Sander Roosendaal 2018-07-01 22:21:22 +02:00
  • d69c15254f mocked all c2stuff except workout export Sander Roosendaal 2018-07-01 22:15:36 +02:00
  • 4214a4fcfc timezone selector in workout edit form Sander Roosendaal 2018-07-01 17:21:18 +02:00
  • 6a0c819ea3 added c2list test Sander Roosendaal 2018-07-01 17:07:03 +02:00
  • cbaada7945 mocking c2import successfully Sander Roosendaal 2018-07-01 13:23:24 +02:00
  • e8dd12c8b8 merged develop Sander Roosendaal 2018-06-29 23:51:48 +02:00
  • b68187df87 Merge branch 'develop' into feature/revisedimports Sander Roosendaal 2018-06-29 23:31:29 +02:00
  • 200ff3c43f deleted some prints Sander Roosendaal 2018-06-29 23:23:10 +02:00
  • 02dee883a1 Merge tag 'v7.14' into develop Sander Roosendaal 2018-06-29 23:13:53 +02:00
  • 7b9e7ac19f Merge branch 'release/v7.14' Sander Roosendaal 2018-06-29 23:13:40 +02:00
  • 89cf064f03 fixed Sander Roosendaal 2018-06-29 23:10:19 +02:00
  • 9ab9734fb9 Merge branch 'develop' into feature/revisedimports Sander Roosendaal 2018-06-28 16:46:08 +02:00
  • 951e707b6e changed admin Sander Roosendaal 2018-06-28 16:40:07 +02:00
  • 04bbbda2a8 Merge tag 'v7.13' into develop Sander Roosendaal 2018-06-28 16:22:34 +02:00
  • 686c92346f Merge branch 'hotfix/v7.13' Sander Roosendaal 2018-06-28 16:22:16 +02:00
  • d4b5314e9e moved strava to the back Sander Roosendaal 2018-06-28 16:20:48 +02:00
  • 2605c1dec3 Merge tag 'v7.12' into develop Sander Roosendaal 2018-06-28 16:16:02 +02:00
  • 94d2b8b7f5 Merge branch 'hotfix/v7.12' Sander Roosendaal 2018-06-28 16:15:35 +02:00
  • e67e55bbb7 fixed Sander Roosendaal 2018-06-28 16:14:24 +02:00
  • 40c302b014 Merge tag 'v7.11' into develop Sander Roosendaal 2018-06-28 15:32:39 +02:00
  • 120b105118 Merge branch 'hotfix/v7.11' Sander Roosendaal 2018-06-28 15:32:03 +02:00
  • 35b71c0b63 through emails now Sander Roosendaal 2018-06-28 15:31:21 +02:00
  • 6acb5d9f49 through email now Sander Roosendaal 2018-06-28 14:26:08 +02:00
  • 9a11102dcd Merge tag 'v7.10' into develop Sander Roosendaal 2018-06-28 13:36:48 +02:00
  • f3edead9b9 Merge branch 'hotfix/v7.10' Sander Roosendaal 2018-06-28 13:35:55 +02:00
  • 13f98d1f54 trying reading rdata Sander Roosendaal 2018-06-28 13:34:52 +02:00
  • 63fb915c00 Merge tag 'v7.09' into develop Sander Roosendaal 2018-06-28 10:09:36 +02:00
  • 3f9ccd3962 Merge branch 'hotfix/v7.09' Sander Roosendaal 2018-06-28 10:09:22 +02:00
  • 5eb2edc60f moving save routine to dataprepnodjango Sander Roosendaal 2018-06-28 10:07:34 +02:00
  • 5122cbd383 Merge tag 'v7.08' into develop Sander Roosendaal 2018-06-27 21:43:51 +02:00
  • 608a773566 Merge branch 'hotfix/v7.08' Sander Roosendaal 2018-06-27 21:43:30 +02:00
  • 7b93833056 adding message when saving import settings Sander Roosendaal 2018-06-27 21:42:32 +02:00
  • 2f31234aea adding dropna Sander Roosendaal 2018-06-27 21:41:11 +02:00
  • cda17057f7 Merge tag 'v7.07' into develop Sander Roosendaal 2018-06-27 21:13:30 +02:00
  • 9439fa33ac Merge branch 'hotfix/v7.07' Sander Roosendaal 2018-06-27 21:12:56 +02:00
  • ca598438a1 removing velo Sander Roosendaal 2018-06-27 21:12:05 +02:00
  • 0e64ff0bb4 Merge tag 'v7.06' into develop Sander Roosendaal 2018-06-27 21:08:52 +02:00
  • c15e0f8ad2 Merge branch 'hotfix/v7.06' Sander Roosendaal 2018-06-27 21:07:50 +02:00
  • 8c1e953acf changed dict Sander Roosendaal 2018-06-27 21:04:53 +02:00
  • 9d2c7c04ac Merge tag 'v7.05' into develop Sander Roosendaal 2018-06-27 19:04:18 +02:00
  • 571d61b22c Merge branch 'hotfix/v7.05' Sander Roosendaal 2018-06-27 19:04:03 +02:00
  • b78a443a5c another attempt Sander Roosendaal 2018-06-27 19:03:27 +02:00
  • 13d627a720 Merge tag 'v7.04' into develop Sander Roosendaal 2018-06-27 18:24:51 +02:00
  • 38139eda15 Merge branch 'hotfix/v7.04' Sander Roosendaal 2018-06-27 18:23:22 +02:00
  • c10c6fafe1 improved dataprepnodjango? Sander Roosendaal 2018-06-27 18:22:24 +02:00
  • 7189562931 Merge tag 'v7.03' into develop Sander Roosendaal 2018-06-27 15:01:22 +02:00
  • f578f9911e Merge branch 'hotfix/v7.03' Sander Roosendaal 2018-06-27 15:00:51 +02:00
  • cb2c067516 no changes Sander Roosendaal 2018-06-27 14:59:14 +02:00
  • 6bcdc0e44c mail template improvement Sander Roosendaal 2018-06-27 09:52:21 +02:00