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

Commit Graph

  • c8a57f79ef Merge branch 'release/v2.74' Sander Roosendaal 2017-05-12 19:29:22 +02:00
  • 79149ca7a3 stats DF empty behavior Sander Roosendaal 2017-05-12 19:22:46 +02:00
  • d58c653d0f Merge branch 'feature/boxchart' into develop Sander Roosendaal 2017-05-12 19:12:03 +02:00
  • 3c0157475f minimum viable version of improved stats Sander Roosendaal 2017-05-12 19:10:13 +02:00
  • 50faf1ff1f first version of box chart (wash only) Sander Roosendaal 2017-05-12 15:48:47 +02:00
  • 29f84d6e25 added HR drift, normalized power, training score Sander Roosendaal 2017-05-12 14:19:50 +02:00
  • e1893ab4ff different row summary in dataprep Sander Roosendaal 2017-05-12 11:03:38 +02:00
  • 0830c7bc6c make PDF scrollable on ipad Sander Roosendaal 2017-05-12 08:50:20 +02:00
  • 13848546ff Merge tag 'v2.73' into develop Sander Roosendaal 2017-05-11 21:09:19 +02:00
  • 7cb79381f0 Merge branch 'hotfix/v2.73' Sander Roosendaal 2017-05-11 20:50:52 +02:00
  • f03892f1c7 sporttracks callback Sander Roosendaal 2017-05-11 20:49:57 +02:00
  • 697b10291d Merge tag 'v2.72' into develop Sander Roosendaal 2017-05-11 16:11:45 +02:00
  • 0ae926536f Merge branch 'hotfix/v2.72' Sander Roosendaal 2017-05-11 16:11:20 +02:00
  • cc1df7a403 third party import ids Sander Roosendaal 2017-05-11 16:06:46 +02:00
  • 01bda31818 Merge tag 'v2.71' into develop Sander Roosendaal 2017-05-11 15:34:42 +02:00
  • 95f77202de Merge branch 'release/v2.71' Sander Roosendaal 2017-05-11 15:34:27 +02:00
  • 1e7a833da1 notifications for comments Sander Roosendaal 2017-05-11 15:24:55 +02:00
  • c6de8d9068 Merge tag 'v2.7' into develop Sander Roosendaal 2017-05-11 13:29:45 +02:00
  • e610798a12 Merge branch 'release/v2.7' Sander Roosendaal 2017-05-11 13:29:20 +02:00
  • 5ad43026c7 removed exp code Sander Roosendaal 2017-05-11 13:21:45 +02:00
  • 892eee32ff Merge branch 'feature/messaging' into develop Sander Roosendaal 2017-05-11 12:08:09 +02:00
  • 85fd6759ea finalizing Sander Roosendaal 2017-05-11 12:06:44 +02:00
  • 4a10584733 some fixes after testing Sander Roosendaal 2017-05-11 11:58:44 +02:00
  • 514e54e814 bug fixes after testing Sander Roosendaal 2017-05-11 11:03:17 +02:00
  • bbe9ae4770 completely mmigrated to django messages Sander Roosendaal 2017-05-11 10:27:38 +02:00
  • 80ebb91255 messages for upload Sander Roosendaal 2017-05-11 09:21:07 +02:00
  • 33e185912e some error checking in interactive plot Sander Roosendaal 2017-05-11 08:47:42 +02:00
  • ab138f29ef Merge tag 'v2.68' into develop Sander Roosendaal 2017-05-10 22:36:15 +02:00
  • edd1186dfc Merge branch 'release/v2.68' Sander Roosendaal 2017-05-10 22:36:03 +02:00
  • d3315c2ed9 works on develop Sander Roosendaal 2017-05-10 22:34:03 +02:00
  • 7ac85c37b1 Merge tag 'v2.67' into develop Sander Roosendaal 2017-05-10 21:27:05 +02:00
  • 59ec866877 Merge branch 'release/v2.67' Sander Roosendaal 2017-05-10 21:26:54 +02:00
  • 51dd0ef926 with RQ Sander Roosendaal 2017-05-10 21:25:23 +02:00
  • 926eb06ee5 Merge tag 'v2.66' into develop Sander Roosendaal 2017-05-10 21:22:45 +02:00
  • 5a20d5559a Merge branch 'release/v2.66' Sander Roosendaal 2017-05-10 21:22:15 +02:00
  • d0a1c3c3bd test without RQ Sander Roosendaal 2017-05-10 21:20:58 +02:00
  • 887634e033 Merge tag 'v2.65' into develop Sander Roosendaal 2017-05-10 21:19:00 +02:00
  • d308c6ae93 Merge branch 'release/v2.65' Sander Roosendaal 2017-05-10 21:18:46 +02:00
  • e7ef5bce20 test async Sander Roosendaal 2017-05-10 21:16:59 +02:00
  • a08168646d Merge tag 'v2.64' into develop Sander Roosendaal 2017-05-10 21:11:34 +02:00
  • 2b627177d3 Merge branch 'release/v2.64' Sander Roosendaal 2017-05-10 21:11:25 +02:00
  • 6c9acaaa91 typo Sander Roosendaal 2017-05-10 21:09:38 +02:00
  • 86bf9015b9 Merge tag 'v2.63' into develop Sander Roosendaal 2017-05-10 21:07:18 +02:00
  • d5056cb029 Merge branch 'release/v2.63' Sander Roosendaal 2017-05-10 21:06:03 +02:00
  • ce5de5cbb6 trying with queue Sander Roosendaal 2017-05-10 21:03:53 +02:00
  • 104094b4f5 Merge tag 'v2.62' into develop Sander Roosendaal 2017-05-10 20:59:05 +02:00
  • cf653b6cc0 Merge branch 'release/v2.62' Sander Roosendaal 2017-05-10 20:58:49 +02:00
  • 5f948dadf9 removed Workout object Sander Roosendaal 2017-05-10 20:56:44 +02:00
  • e78b8ffc22 Merge tag 'v2.61' into develop Sander Roosendaal 2017-05-10 17:32:23 +02:00
  • df4143cf13 Merge branch 'release/v2.61' Sander Roosendaal 2017-05-10 17:32:06 +02:00
  • 7fdac73358 further settings test Sander Roosendaal 2017-05-10 17:30:58 +02:00
  • 8ad20dccda Merge tag 'v2.60' into develop Sander Roosendaal 2017-05-10 17:13:48 +02:00
  • b92bc7dcdf Merge branch 'release/v2.60' Sander Roosendaal 2017-05-10 17:13:28 +02:00
  • c31e51145c runs under dev Sander Roosendaal 2017-05-10 17:12:08 +02:00
  • 6008adc97a Merge tag 'v2.59' into develop Sander Roosendaal 2017-05-10 17:09:08 +02:00
  • 028a2bc605 Merge branch 'release/v2.59' Sander Roosendaal 2017-05-10 17:07:49 +02:00
  • bbce299277 import django in tasks Sander Roosendaal 2017-05-10 17:06:34 +02:00
  • 638b0dd09b Merge tag 'v2.58' into develop Sander Roosendaal 2017-05-10 16:59:58 +02:00
  • bf5d987c07 Merge branch 'release/v2.58' Sander Roosendaal 2017-05-10 16:59:40 +02:00
  • ac2bdbce3d improved standalone tasks Sander Roosendaal 2017-05-10 16:57:12 +02:00
  • e40db4c55c Merge tag 'v2.57' into develop Sander Roosendaal 2017-05-10 14:54:32 +02:00
  • 8d21cacf48 Merge branch 'release/v2.57' Sander Roosendaal 2017-05-10 14:53:53 +02:00
  • 50eda6b135 try with standalone Sander Roosendaal 2017-05-10 14:51:06 +02:00
  • be2f6803d3 Merge tag 'v2.56' into develop Sander Roosendaal 2017-05-10 13:03:44 +02:00
  • 0ca440fe7c Merge branch 'release/v2.56' Sander Roosendaal 2017-05-10 13:03:23 +02:00
  • dff5b2a975 further testing job Sander Roosendaal 2017-05-10 13:02:13 +02:00
  • a173a4d601 Merge tag 'v2.55' into develop Sander Roosendaal 2017-05-10 12:48:06 +02:00
  • 49a3fe8c91 Merge branch 'release/v2.55' Sander Roosendaal 2017-05-10 12:47:52 +02:00
  • 44fa1ec056 added further testing Sander Roosendaal 2017-05-10 12:46:27 +02:00
  • adf96da539 Merge tag 'v2.54' into develop Sander Roosendaal 2017-05-10 12:09:23 +02:00
  • 8745a1b3b7 Merge branch 'release/v2.54' Sander Roosendaal 2017-05-10 12:08:12 +02:00
  • f091640e96 adding rq-suit Sander Roosendaal 2017-05-10 12:04:17 +02:00
  • 9ddba3bb02 Merge tag 'v2.53' into develop Sander Roosendaal 2017-05-10 11:14:59 +02:00
  • f55705d555 Merge branch 'release/v2.53' Sander Roosendaal 2017-05-10 11:14:16 +02:00
  • b8d9febc91 prolonged task Sander Roosendaal 2017-05-10 11:12:39 +02:00
  • 1b76ac8e8a Merge tag 'v2.52' into develop Sander Roosendaal 2017-05-10 10:36:23 +02:00
  • e113757046 Merge branch 'release/v2.52' Sander Roosendaal 2017-05-10 10:35:57 +02:00
  • 1e2ec0f037 added test error message Sander Roosendaal 2017-05-10 10:34:45 +02:00
  • b2c5571922 Merge tag 'v2.51' into develop Sander Roosendaal 2017-05-10 10:22:20 +02:00
  • 18196110fd Merge branch 'release/v2.51' Sander Roosendaal 2017-05-10 10:21:59 +02:00
  • addeef0edd Merge branch 'feature/asynchronous' into develop Sander Roosendaal 2017-05-10 10:12:44 +02:00
  • 4aa7b7151a messages working Sander Roosendaal 2017-05-10 10:11:57 +02:00
  • c4ffddfb06 testing tasks and messages Sander Roosendaal 2017-05-10 07:38:14 +02:00
  • 5857c13330 Merge tag 'v2.5' into develop Sander Roosendaal 2017-05-09 21:21:59 +02:00
  • 1f594aa4cf Merge branch 'release/v2.5' Sander Roosendaal 2017-05-09 21:21:31 +02:00
  • 7fd68ceb96 watermark, TrainingPeaks, upload page, brochure Sander Roosendaal 2017-05-09 21:19:08 +02:00
  • f86e303efd rolling back settings Sander Roosendaal 2017-05-09 19:27:58 +02:00
  • c1e5112b17 changed settings_dev Sander Roosendaal 2017-05-09 16:35:56 +02:00
  • abc2c5a7f1 Merge branch 'feature/uploadpage' into develop Sander Roosendaal 2017-05-09 16:19:35 +02:00
  • 48e42620bc final watermark Sander Roosendaal 2017-05-09 16:18:35 +02:00
  • 1b47469400 Merge branch 'develop' into feature/uploadpage Sander Roosendaal 2017-05-09 15:48:18 +02:00
  • b5acdf8498 mail processing Sander Roosendaal 2017-05-09 15:48:06 +02:00
  • 68e6a34919 Merge tag 'v2.44' into develop Sander Roosendaal 2017-05-09 15:32:38 +02:00
  • 4faf0015ba Merge branch 'hotfix/v2.44' Sander Roosendaal 2017-05-09 15:32:08 +02:00
  • b51719f170 added queues to mailprocessing.py Sander Roosendaal 2017-05-09 15:31:09 +02:00
  • 46c355e710 settings.py Sander Roosendaal 2017-05-09 15:24:04 +02:00
  • f89d20f5f2 watermark v3 Sander Roosendaal 2017-05-09 15:23:04 +02:00
  • c7e2c10d09 watermark v2 Sander Roosendaal 2017-05-09 15:14:30 +02:00
  • b0ffb38196 first draft watermark on flex plot Sander Roosendaal 2017-05-09 13:36:25 +02:00
  • 7887c46721 TP done Sander Roosendaal 2017-05-09 11:46:16 +02:00