Private
Public Access
1
0

Commit Graph

  • 6b77408a0c Merge tag 'v7.50' into develop Sander Roosendaal 2018-09-05 21:45:06 +02:00
  • 8de988033d Merge branch 'release/v7.50' Sander Roosendaal 2018-09-05 21:35:51 +02:00
  • 8265c188fd preparing multi compare for sliders Sander Roosendaal 2018-09-05 16:52:35 +02:00
  • 2d87c36c24 removed all start/end date memory Sander Roosendaal 2018-09-05 16:14:49 +02:00
  • 72223578aa bike erg power calculation correction Sander Roosendaal 2018-08-29 11:32:49 +02:00
  • d12897ec03 Merge tag 'v7.49' into develop Sander Roosendaal 2018-08-29 10:15:05 +02:00
  • 6cb8801ad1 Merge branch 'release/v7.49' Sander Roosendaal 2018-08-29 10:14:38 +02:00
  • de0b4b690f Merge branch 'feature/bikeerg2' into develop Sander Roosendaal 2018-08-29 09:57:36 +02:00
  • b41f4c77de bike erg export to C2 Sander Roosendaal 2018-08-29 09:55:02 +02:00
  • cadc5d5e0d bike erg import from C2 log Sander Roosendaal 2018-08-29 09:46:46 +02:00
  • 10e989d32d reverted bikeerg conversion in dataprep Sander Roosendaal 2018-08-29 09:23:59 +02:00
  • 219afaa40e defined one p0 in datautils for CP fits Sander Roosendaal 2018-08-28 16:37:55 +02:00
  • 7e29c3b65d Merge tag 'v7.48' into develop Sander Roosendaal 2018-08-28 13:28:05 +02:00
  • e8aecb155f Merge branch 'release/v7.48' Sander Roosendaal 2018-08-28 13:27:37 +02:00
  • 92806959fc bug fix Sander Roosendaal 2018-08-28 13:24:14 +02:00
  • fbee615d47 Merge tag 'v7.47' into develop Sander Roosendaal 2018-08-28 13:19:02 +02:00
  • 4d6b59d404 Merge branch 'release/v7.47' Sander Roosendaal 2018-08-28 13:15:16 +02:00
  • 8caddb72e1 added otw version of cp data to admin Sander Roosendaal 2018-08-28 13:10:42 +02:00
  • 27287be369 Merge tag 'v7.46' into develop Sander Roosendaal 2018-08-28 12:58:39 +02:00
  • 453a1a2c40 Merge branch 'hotfix/v7.46' Sander Roosendaal 2018-08-28 12:55:49 +02:00
  • 9d228391c4 fix Sander Roosendaal 2018-08-28 12:54:25 +02:00
  • 4e92296be6 Merge tag 'v7.45' into develop Sander Roosendaal 2018-08-28 12:41:59 +02:00
  • aaa9919f4f Merge branch 'hotfix/v7.45' Sander Roosendaal 2018-08-28 12:41:14 +02:00
  • dc07f7c7cd bug fix Sander Roosendaal 2018-08-28 12:39:37 +02:00
  • 3cba512033 Merge tag 'v7.44' into develop Sander Roosendaal 2018-08-28 12:23:46 +02:00
  • d58658042d Merge branch 'release/v7.44' Sander Roosendaal 2018-08-28 12:16:12 +02:00
  • 4f5695723b cp data sending to admin Sander Roosendaal 2018-08-28 11:59:18 +02:00
  • 18b8f96418 Merge branch 'feature/bikeerg' into develop Sander Roosendaal 2018-08-28 09:43:28 +02:00
  • 92a696a43c export to C2 Sander Roosendaal 2018-08-28 09:41:35 +02:00
  • d85b9ac7f2 initial implementation Sander Roosendaal 2018-08-27 15:27:01 +02:00
  • 5243bb4016 improved export settings for offline processing Sander Roosendaal 2018-08-27 12:39:32 +02:00
  • 1c3ef2f629 Merge tag 'v7.43' into develop Sander Roosendaal 2018-08-19 18:10:36 +02:00
  • 2ce0170e27 Merge branch 'hotfix/v7.43' Sander Roosendaal 2018-08-19 18:09:46 +02:00
  • f17b3ec006 bug fix Sander Roosendaal 2018-08-19 18:06:13 +02:00
  • dd7e3facd9 Merge tag 'v7.42' into develop Sander Roosendaal 2018-08-18 13:18:23 +02:00
  • 7962475af0 Merge branch 'hotfix/v7.42' Sander Roosendaal 2018-08-18 13:17:42 +02:00
  • 0140816e7f bug fix in race edit Sander Roosendaal 2018-08-18 13:16:00 +02:00
  • 50860211d1 xmlcreate by courses Sander Roosendaal 2018-08-17 10:58:01 +02:00
  • 31d9fe8f00 Merge tag 'v7.40' into develop Sander Roosendaal 2018-08-15 10:55:33 +02:00
  • 486e9d830f Merge branch 'hotfix/v7.40' Sander Roosendaal 2018-08-15 10:53:36 +02:00
  • 2374b1b0bc added headers key to oauth_settings Sander Roosendaal 2018-08-15 10:43:21 +02:00
  • 1e23354346 runkeeper patch & course_time_zone bug fix Sander Roosendaal 2018-08-15 10:25:04 +02:00
  • 64f4e58d5a Merge tag 'v7.39' into develop Sander Roosendaal 2018-07-30 12:30:26 +02:00
  • ad225fcde8 Merge branch 'hotfix/v7.39' Sander Roosendaal 2018-07-30 11:54:23 +02:00
  • 7637522bd4 hot fix user account delete Sander Roosendaal 2018-07-30 11:53:16 +02:00
  • a0ef41e2fc added try except in dataprepnodjango Sander Roosendaal 2018-07-24 14:13:34 +02:00
  • 3960a1acc6 Merge tag 'v7.38' into develop Sander Roosendaal 2018-07-23 09:31:29 +02:00
  • bd67cab1f1 Merge branch 'hotfix/v7.38' Sander Roosendaal 2018-07-23 09:31:08 +02:00
  • e70c477f82 bug fix strava & image Sander Roosendaal 2018-07-23 09:07:25 +02:00
  • 126064ae4a Merge tag 'v7.37' into develop Sander Roosendaal 2018-07-19 08:09:45 +02:00
  • 78cc8b86d5 Merge branch 'release/v7.37' Sander Roosendaal 2018-07-19 08:08:58 +02:00
  • 298e973da6 adding empty results at start of virtualeventview Sander Roosendaal 2018-07-19 08:05:43 +02:00
  • 43a384484e Merge tag 'v7.36' into develop Sander Roosendaal 2018-07-17 08:51:54 +02:00
  • caee7d93f3 Merge branch 'hotfix/v7.36' Sander Roosendaal 2018-07-17 08:51:33 +02:00
  • fbb5135446 strava import all & workout edit page small bug fix Sander Roosendaal 2018-07-17 08:13:40 +02:00
  • 7c63218948 Merge tag 'v7.35' into develop Sander Roosendaal 2018-07-16 17:21:58 +02:00
  • 0c405eda49 Merge branch 'hotfix/v7.35' Sander Roosendaal 2018-07-16 17:21:45 +02:00
  • bcb6b4512e bug fix Sander Roosendaal 2018-07-16 17:20:27 +02:00
  • 7ff3500cc4 strava export as rowing on auto export Sander Roosendaal 2018-07-13 09:21:09 +02:00
  • 3219190f66 added at Sander Roosendaal 2018-07-12 22:02:31 +02:00
  • 3e95df4e2a Merge tag 'v7.34' into develop Sander Roosendaal 2018-07-12 21:53:46 +02:00
  • a79f3ca8eb Merge branch 'release/v7.34' Sander Roosendaal 2018-07-12 21:52:54 +02:00
  • 0e70a43a4e adding start date to tasks Sander Roosendaal 2018-07-12 21:34:35 +02:00
  • d19cbb34d4 Merge tag 'v7.33' into develop Sander Roosendaal 2018-07-12 17:32:07 +02:00
  • f15d310a73 Merge branch 'hotfix/v7.33' Sander Roosendaal 2018-07-12 17:30:45 +02:00
  • a44981dda6 changing add_efficiency cleaning up columns Sander Roosendaal 2018-07-12 16:57:41 +02:00
  • 12d689ccf7 Merge tag 'v7.32' into develop Sander Roosendaal 2018-07-12 16:04:41 +02:00
  • 323c1e4c0c Merge branch 'release/v7.32' Sander Roosendaal 2018-07-12 16:04:18 +02:00
  • 386d3d947d Merge branch 'bugfix/stats' into develop Sander Roosendaal 2018-07-12 15:44:43 +02:00
  • 2fc2aa2810 preventing infinite recursion Sander Roosendaal 2018-07-12 15:43:28 +02:00
  • d7e117df41 Merge branch 'develop' into bugfix/stats Sander Roosendaal 2018-07-12 15:12:18 +02:00
  • 3a5768a500 Merge tag 'v7.31' into develop Sander Roosendaal 2018-07-12 15:07:33 +02:00
  • 6a3d874ae1 Merge branch 'hotfix/v7.31' Sander Roosendaal 2018-07-12 15:06:52 +02:00
  • d0f928d299 catching keyerror as well Sander Roosendaal 2018-07-12 15:05:55 +02:00
  • b6584795f2 more try except in c2stuff - bugfix Sander Roosendaal 2018-07-12 15:04:22 +02:00
  • eff6110395 small update of dataprepnodjango Sander Roosendaal 2018-07-12 14:58:36 +02:00
  • 08125cdd95 Merge branch 'develop' into bugfix/stats Sander Roosendaal 2018-07-12 13:38:37 +02:00
  • 2a0194c56c Merge tag 'v7.30' into develop Sander Roosendaal 2018-07-12 13:37:51 +02:00
  • 814556b100 Merge branch 'hotfix/v7.30' Sander Roosendaal 2018-07-12 13:36:45 +02:00
  • 3ddac6573a bug fix Sander Roosendaal 2018-07-12 12:59:26 +02:00
  • 290fd656a5 Merge branch 'bugfix/notifications' into develop Sander Roosendaal 2018-07-12 12:51:05 +02:00
  • a9dc9e61f3 bugfix Sander Roosendaal 2018-07-12 12:49:40 +02:00
  • 80623af8c5 notifications suppressed & some strava checking Sander Roosendaal 2018-07-12 12:39:10 +02:00
  • 9ba187dc8f commit Sander Roosendaal 2018-07-11 16:23:19 +02:00
  • 1ada144b8e Merge tag 'v7.29' into develop Sander Roosendaal 2018-07-10 16:00:58 +02:00
  • 24aef2c92a Merge branch 'release/v7.29' Sander Roosendaal 2018-07-10 16:00:34 +02:00
  • c5b0351153 checking for isfinite in normw, normv calc Sander Roosendaal 2018-07-10 14:56:31 +02:00
  • 08ca7539f2 logout redirect improved Sander Roosendaal 2018-07-10 14:49:48 +02:00
  • d5023f64c5 Merge branch 'bugfix/impex' into develop Sander Roosendaal 2018-07-10 14:12:09 +02:00
  • 0a677bcbd8 code merge strava import all Sander Roosendaal 2018-07-10 14:11:22 +02:00
  • 2fdcaedc7f fixed bug Sander Roosendaal 2018-07-10 12:52:53 +02:00
  • 0c7e948ee1 Merge tag 'v7.28' into develop Sander Roosendaal 2018-07-09 18:53:01 +02:00
  • 1e25a29819 Merge branch 'hotfix/v7.28' Sander Roosendaal 2018-07-09 18:52:45 +02:00
  • ebefc67492 bug fixes Sander Roosendaal 2018-07-09 18:36:56 +02:00
  • c861618389 Merge tag 'v7.27' into develop Sander Roosendaal 2018-07-09 06:41:29 +02:00
  • d83e8b58ce Merge branch 'release/v7.27' Sander Roosendaal 2018-07-09 06:41:06 +02:00
  • 5fed54097d repaired TrainingPeaks Sander Roosendaal 2018-07-09 06:21:34 +02:00
  • 2d84fd6cd0 bug fixes import export Sander Roosendaal 2018-07-09 05:52:28 +02:00
  • e63c58a687 Merge tag 'v7.26' into develop Sander Roosendaal 2018-07-08 21:36:35 +02:00
  • b8f85a916f Merge branch 'release/v7.26' Sander Roosendaal 2018-07-08 21:36:02 +02:00