sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Commit Graph

  • b2d8481d9d Merge tag 'v3.02' into develop Sander Roosendaal 2017-05-23 22:12:29 +02:00
  • f545f25113 Merge branch 'hotfix/v3.02' Sander Roosendaal 2017-05-23 22:10:33 +02:00
  • eea087f4ee bug fix Sander Roosendaal 2017-05-23 22:05:25 +02:00
  • ce6e0cc375 Merge tag 'v3.01' into develop Sander Roosendaal 2017-05-23 20:25:04 +02:00
  • f6070e985f Merge branch 'hotfix/v3.01' Sander Roosendaal 2017-05-23 20:24:37 +02:00
  • e1f9378107 bugfix drive length Sander Roosendaal 2017-05-23 20:19:11 +02:00
  • 1acad5dbf1 fixed tuple in notes Sander Roosendaal 2017-05-23 17:12:32 +02:00
  • 4b4d726a34 Merge tag 'v3.00' into develop Sander Roosendaal 2017-05-23 09:21:38 +02:00
  • 83c6cecdd9 Merge branch 'hotfix/v3.00' Sander Roosendaal 2017-05-23 09:21:19 +02:00
  • a50041cc92 return controlled error for data without time data Sander Roosendaal 2017-05-23 09:13:52 +02:00
  • cb41e1c9ee Merge tag 'v2.99' into develop Sander Roosendaal 2017-05-22 20:50:51 +02:00
  • 60e868c040 Merge branch 'hotfix/v2.99' Sander Roosendaal 2017-05-22 20:49:42 +02:00
  • b0e7ab2cb9 correction for None notes everywhere Sander Roosendaal 2017-05-22 20:42:45 +02:00
  • ade8787944 Merge tag 'v2.98' into develop Sander Roosendaal 2017-05-22 20:14:41 +02:00
  • dd43805c08 Merge branch 'hotfix/v2.98' Sander Roosendaal 2017-05-22 20:14:24 +02:00
  • 969077fe22 fixed strava export bug Sander Roosendaal 2017-05-22 20:13:17 +02:00
  • 260399bf49 Merge tag 'v2.97' into develop Sander Roosendaal 2017-05-22 15:17:21 +02:00
  • 0ef6840d22 Merge branch 'hotfix/v2.97' Sander Roosendaal 2017-05-22 15:16:55 +02:00
  • d25d41d496 switched off error catching in stravaworkoutdata Sander Roosendaal 2017-05-22 15:15:44 +02:00
  • cad864df1d Merge tag 'v2.96' into develop Sander Roosendaal 2017-05-22 15:03:04 +02:00
  • f735d6a18c Merge branch 'release/v2.96' Sander Roosendaal 2017-05-22 15:02:52 +02:00
  • 591c7a0764 fixed double deletion Sander Roosendaal 2017-05-22 14:50:29 +02:00
  • dfeea93e2d Merge tag 'v2.95' into develop Sander Roosendaal 2017-05-22 14:30:46 +02:00
  • ad1990728f Merge branch 'release/v2.95' Sander Roosendaal 2017-05-22 14:29:26 +02:00
  • 0a19812c1d Merge branch 'bugfix/stravaexport' into develop Sander Roosendaal 2017-05-22 14:23:05 +02:00
  • 753f4a5b9a removed print statement Sander Roosendaal 2017-05-22 14:22:24 +02:00
  • b3564313dd strava upload improvements Sander Roosendaal 2017-05-22 14:19:43 +02:00
  • 15ac9e7815 Merge tag 'v2.94' into develop Sander Roosendaal 2017-05-22 08:27:25 +02:00
  • 400c61929c Merge branch 'hotfix/v2.94' Sander Roosendaal 2017-05-22 08:26:11 +02:00
  • b14526771c fix Sander Roosendaal 2017-05-22 08:25:27 +02:00
  • 99f3ad968d hotfix flexall Sander Roosendaal 2017-05-22 07:33:46 +02:00
  • 3bf512179c solved losing Empower data Sander Roosendaal 2017-05-19 13:27:09 +02:00
  • a84ddf73d9 Merge tag 'v2.93' into develop Sander Roosendaal 2017-05-18 21:43:52 +02:00
  • a32dcdccb4 Merge branch 'hotfix/v2.93' Sander Roosendaal 2017-05-18 21:43:14 +02:00
  • 3afc1c642e fixed incorrect messages.error call Sander Roosendaal 2017-05-18 21:42:00 +02:00
  • cf1c80b68e Merge tag 'v2.92' into develop Sander Roosendaal 2017-05-18 20:42:57 +02:00
  • d00bfaff52 Merge branch 'release/v2.92' Sander Roosendaal 2017-05-18 20:42:24 +02:00
  • da2066cfd1 FIT from C2 Sander Roosendaal 2017-05-18 20:38:51 +02:00
  • e0f8678eda Merge tag 'v2.91' into develop Sander Roosendaal 2017-05-18 20:11:15 +02:00
  • 409654e594 Merge branch 'hotfix/v2.91' Sander Roosendaal 2017-05-18 20:07:47 +02:00
  • 0660d954db hotfix message on SportTracks export Sander Roosendaal 2017-05-18 20:06:40 +02:00
  • 1d9dd56951 added str2bool for workstrokesonly Sander Roosendaal 2017-05-18 19:55:35 +02:00
  • ec2f5610cf Merge tag 'v2.9' into develop Sander Roosendaal 2017-05-18 19:27:06 +02:00
  • 4e5b20304d Merge branch 'release/v2.9' Sander Roosendaal 2017-05-18 19:25:13 +02:00
  • eb9c7ed33f default OTW slack set to 0 Sander Roosendaal 2017-05-18 18:45:17 +02:00
  • 40313f9680 adding OTW power slack Sander Roosendaal 2017-05-18 15:23:09 +02:00
  • 9578be77c0 some small improvement (export messages) Sander Roosendaal 2017-05-18 10:19:39 +02:00
  • ba38a0747a csv to admin functionality Sander Roosendaal 2017-05-17 16:30:05 +02:00
  • eb391fec77 Merge branch 'feature/c2automatic' into develop Sander Roosendaal 2017-05-17 13:35:26 +02:00
  • be13626fbc strava done Sander Roosendaal 2017-05-17 13:34:01 +02:00
  • 12d95cfe43 C2 and ST button to import all new workouts Sander Roosendaal 2017-05-17 11:54:02 +02:00
  • bb2283635e bug fix Sander Roosendaal 2017-05-17 09:44:47 +02:00
  • b7d7d5cc83 redirects to boxchart workout picker when ids messed up Sander Roosendaal 2017-05-17 09:31:56 +02:00
  • 791d537b8d added user name to paypal button field Sander Roosendaal 2017-05-17 09:02:14 +02:00
  • b569fb2c46 small improvement Sander Roosendaal 2017-05-16 20:23:45 +02:00
  • 2b61fdea47 Merge tag 'v2.86' into develop Sander Roosendaal 2017-05-16 20:20:10 +02:00
  • b025f7515e Merge branch 'release/v2.86' Sander Roosendaal 2017-05-16 20:19:07 +02:00
  • e1ab50d959 bug fix Sander Roosendaal 2017-05-16 20:18:03 +02:00
  • 1973af07a1 check rowerplan in checkexpired Sander Roosendaal 2017-05-16 20:16:13 +02:00
  • c393afdaba Merge tag 'v2.85' into develop Sander Roosendaal 2017-05-16 20:07:31 +02:00
  • cd03e9326d Merge branch 'release/v2.85' Sander Roosendaal 2017-05-16 20:07:12 +02:00
  • c0e65a38e9 try/except in workout edit save Sander Roosendaal 2017-05-16 20:01:08 +02:00
  • 010f2ac2e3 fixed issue 109 Sander Roosendaal 2017-05-16 18:28:49 +02:00
  • 8d91cf7b4c added expired user email management command Sander Roosendaal 2017-05-16 18:21:55 +02:00
  • 762a69f926 Merge branch 'feature/boxchartsliders' into develop Sander Roosendaal 2017-05-16 17:32:04 +02:00
  • e04800db2f added tooltip Sander Roosendaal 2017-05-16 17:31:04 +02:00
  • 4658e241a4 filtering working Sander Roosendaal 2017-05-16 17:17:15 +02:00
  • 00cd6299fd Merge tag 'v2.84' into develop Sander Roosendaal 2017-05-16 12:55:52 +02:00
  • d01f9c4391 Merge branch 'hotfix/v2.84' Sander Roosendaal 2017-05-16 12:51:12 +02:00
  • 1f04adbf16 bug fix Sander Roosendaal 2017-05-16 12:49:39 +02:00
  • b3017a900e Merge tag 'v2.83' into develop Sander Roosendaal 2017-05-16 10:44:31 +02:00
  • 5fa98ebf5b Merge branch 'release/v2.83' Sander Roosendaal 2017-05-16 10:42:42 +02:00
  • f0a35aa8c0 fixed a few bgs Sander Roosendaal 2017-05-16 10:10:43 +02:00
  • e8e7312fb6 added title to box plot Sander Roosendaal 2017-05-15 21:17:17 +02:00
  • d4c16f2c1a Merge tag 'v2.82' into develop Sander Roosendaal 2017-05-15 20:56:54 +02:00
  • f7d0014340 Merge branch 'hotfix/v2.82' Sander Roosendaal 2017-05-15 20:56:36 +02:00
  • 8e2d811485 date and user stable with search Sander Roosendaal 2017-05-15 20:55:30 +02:00
  • 981b111946 Merge tag 'v2.81' into develop Sander Roosendaal 2017-05-15 20:35:23 +02:00
  • 69a18b6ef7 Merge branch 'release/v2.81' Sander Roosendaal 2017-05-15 20:33:36 +02:00
  • a3e61ec215 team stats page Sander Roosendaal 2017-05-15 20:22:15 +02:00
  • 1530cdaa61 rower switcher on stats pages Sander Roosendaal 2017-05-15 14:54:34 +02:00
  • be02fe4fbc Merge branch 'feature/tpsync' into develop Sander Roosendaal 2017-05-15 09:51:15 +02:00
  • 38fa4ad87f flex charts sliders for non-empower Sander Roosendaal 2017-05-15 09:50:28 +02:00
  • 3b3bb845d9 fix no power * driveenergy sliders Sander Roosendaal 2017-05-15 09:48:28 +02:00
  • f17caf37b9 Merge tag 'v2.8' into develop Sander Roosendaal 2017-05-14 15:00:45 +02:00
  • 1719731110 Merge branch 'release/v2.8' Sander Roosendaal 2017-05-14 15:00:19 +02:00
  • 271f6a4f1a C2 message Sander Roosendaal 2017-05-14 14:56:25 +02:00
  • 00afa9b9ea Merge branch 'feature/boxplotpicker' into develop Sander Roosendaal 2017-05-14 14:47:48 +02:00
  • d1fe31a0c8 MVP version of box charts Sander Roosendaal 2017-05-14 14:46:59 +02:00
  • 6208110a0a boxplot sort of working Sander Roosendaal 2017-05-14 14:19:23 +02:00
  • 218fecdb73 sporttracksstuff Sander Roosendaal 2017-05-14 12:13:00 +02:00
  • 341112b6d5 pop workoutid in stats Sander Roosendaal 2017-05-13 18:06:39 +02:00
  • 67023c03dd Merge tag 'v2.76' into develop Sander Roosendaal 2017-05-13 18:04:46 +02:00
  • a298caec6a Merge branch 'hotfix/v2.76' Sander Roosendaal 2017-05-13 17:49:11 +02:00
  • 3cfc7597d9 lbston confusion Sander Roosendaal 2017-05-13 17:47:54 +02:00
  • e09b4d2f2b Merge tag 'v2.75' into develop Sander Roosendaal 2017-05-12 21:10:45 +02:00
  • dcb2bcc3ae Merge branch 'hotfix/v2.75' Sander Roosendaal 2017-05-12 21:10:21 +02:00
  • 2340b17500 further correction Sander Roosendaal 2017-05-12 21:09:17 +02:00
  • c23542154c double lbstoN correction Sander Roosendaal 2017-05-12 21:07:25 +02:00
  • 1c849e8357 Merge tag 'v2.74' into develop Sander Roosendaal 2017-05-12 19:30:07 +02:00