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

Commit Graph

  • aad3aac311 Merge branch 'release/annotations' Sander Roosendaal 2016-11-18 19:10:55 +01:00
  • c3e8bc28a5 Annotations Sander Roosendaal 2016-11-18 15:28:57 +01:00
  • ae7b7fb9ab Email confirmations for workouts received Sander Roosendaal 2016-11-18 13:52:22 +01:00
  • 439bca2f9c Added Average/Peak Force Ratio Sander Roosendaal 2016-11-18 13:12:57 +01:00
  • 836a3f6dee Tests for SportTracks and Strava data structures Sander Roosendaal 2016-11-14 14:53:36 +01:00
  • a80e48978a added rowpro to compatibility list Sander Roosendaal 2016-11-14 09:03:37 +01:00
  • 795d94df16 Merge tag 'smoothing' into develop Sander Roosendaal 2016-11-13 12:00:08 +01:00
  • f4f6513758 Merge branch 'release/smoothing' Sander Roosendaal 2016-11-13 11:59:49 +01:00
  • ae0d95ecb5 Improved Smoothing Sander Roosendaal 2016-11-13 11:55:15 +01:00
  • 780c1f9611 Updated About page and added Compatibility page Sander Roosendaal 2016-11-10 16:29:06 +01:00
  • 9033221a3a Merge tag 'powerzones' into develop Sander Roosendaal 2016-11-09 00:06:37 +01:00
  • 9522755283 Merge branch 'release/powerzones' Sander Roosendaal 2016-11-09 00:06:01 +01:00
  • c9e2bc9721 Merge branch 'feature/powerzones' into develop Sander Roosendaal 2016-11-09 00:01:52 +01:00
  • cde106bb19 power zones Sander Roosendaal 2016-11-09 00:00:13 +01:00
  • 48044108b2 Removed wrongly copied files Roosendaal 2016-11-08 19:54:19 +01:00
  • 3444995880 Initial updates (rowerpowerform) and ftp everywhere rrower is called sanderroosendaal 2016-11-08 10:31:27 +01:00
  • 02a12585a2 removed static plots from commit sanderroosendaal 2016-11-07 14:47:26 +01:00
  • bbcbee2bb1 Merge tag 'bugfix_c2callback' into develop sanderroosendaal 2016-11-07 14:25:38 +01:00
  • bb43018fda Merge branch 'release/bugfix_c2callback' sanderroosendaal 2016-11-07 14:25:05 +01:00
  • 51de3f9c5e Fixed bug when user pressed Red Deny Access button on C2 logbook sanderroosendaal 2016-11-07 14:20:51 +01:00
  • 57243e3187 Updated sanderroosendaal 2016-11-06 18:52:59 +01:00
  • 52f6d180df Merge branch 'feature/restapitesting' into develop sanderroosendaal 2016-11-06 17:56:41 +01:00
  • 1a1b1d403f Added simple test for C2 Stroke data sanderroosendaal 2016-11-06 17:55:51 +01:00
  • 689749567b Merge tag 'dragfactor' into develop sanderroosendaal 2016-11-06 17:02:19 +01:00
  • aa02d10bfc Merge branch 'release/dragfactor' sanderroosendaal 2016-11-06 17:02:02 +01:00
  • 3a1bee888f Merge branch 'feature/dragfactor' into develop sanderroosendaal 2016-11-06 16:58:26 +01:00
  • d1a8bacc9a Updated C2 import function to add zero drag factor sanderroosendaal 2016-11-06 16:57:35 +01:00
  • 464550deb9 Added minimock and created new class in tests.py - work in progress sanderroosendaal 2016-11-06 16:35:41 +01:00
  • cb4784e214 Edited settings.py to make mail processing work sanderroosendaal 2016-11-05 13:39:18 +01:00
  • a32fdcf636 Merge branch 'master' into develop sanderroosendaal 2016-11-03 15:17:18 +01:00
  • 08120c5192 Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall sanderroosendaal 2016-11-03 15:12:21 +01:00
  • 57938ef19d Merge tag 'dataprep' into develop sanderroosendaal 2016-11-03 15:10:04 +01:00
  • 7006ccc008 Merge branch 'release/dataprep' sanderroosendaal 2016-11-03 15:09:43 +01:00
  • 3cba8e5e45 Fixed Ranking distances sanderroosendaal 2016-11-03 12:03:56 +01:00
  • 8a0518d7eb All Interactive plots now use the dataprep functions sanderroosendaal 2016-11-03 10:26:59 +01:00
  • 902357ba5c gitignore updated sanderroosendaal 2016-11-02 21:14:03 +01:00
  • ff4cc5dfa2 Merge branch 'master' of bitbucket.org:sanderroosendaal/rowsandall Sander 2016-11-02 21:07:18 +01:00
  • 7ab14e8980 added manage.py to gitignore Sander 2016-11-02 21:04:50 +01:00
  • 04c1b2ef13 Added manage.py to git sanderroosendaal 2016-11-02 20:50:56 +01:00
  • 886d5417ed Added manage.py to gitignore sanderroosendaal 2016-11-02 20:46:28 +01:00
  • 0b1f542e26 Added media to gitignore sanderroosendaal 2016-11-02 20:41:45 +01:00
  • c39bffc8ed Added /media to gitignore sanderroosendaal 2016-11-02 20:40:50 +01:00
  • a14ab53415 Flex Chart updated sanderroosendaal 2016-11-02 17:41:54 +01:00
  • 030e2df146 Merge tag 'c2import' into develop sanderroosendaal 2016-11-01 22:42:01 +01:00
  • 47569c23c4 Merge branch 'hotfix/c2import' c2import sanderroosendaal 2016-11-01 22:41:41 +01:00
  • 23266b02c0 Fixed Concept2 Import bug (empty notes field) sanderroosendaal 2016-11-01 22:38:56 +01:00
  • 9d2633bfde Finished improving cum_flex chart sanderroosendaal 2016-11-01 22:08:33 +01:00
  • 01ea80c539 Make plotintervals more rational (dataprep) - continue at cum_flex sanderroosendaal 2016-11-01 17:43:46 +01:00
  • a892188e85 Added fillna to pace and time calculations sanderroosendaal 2016-11-01 10:02:10 +01:00
  • 4dd42d43c7 Rewrote interactiveplots to use timedelta everywhere for time and pace sanderroosendaal 2016-11-01 09:48:03 +01:00
  • 12c3ead542 Merge tag 'paceline' into develop sanderroosendaal 2016-10-31 21:19:02 +01:00
  • 86ad96d6c0 Merge branch 'hotfix/paceline' paceline sanderroosendaal 2016-10-31 21:18:26 +01:00
  • cc93ec9ccb Fixed bugs for pace rendering on charts and in text sanderroosendaal 2016-10-31 21:16:08 +01:00
  • 5a280afd0b Merge tag 'twitter' into develop sanderroosendaal 2016-10-31 19:18:43 +01:00
  • 3298259400 Merge branch 'release/twitter' twitter sanderroosendaal 2016-10-31 19:18:20 +01:00
  • 7f92f1f4d4 Added Twitter and Bitbucket to contact/email page sanderroosendaal 2016-10-31 19:16:59 +01:00
  • 8bc3699e12 Merge branch 'feature/timedelta' into develop sanderroosendaal 2016-10-31 17:30:24 +01:00
  • 17a7e236b8 Fixed some time rendering bugs sanderroosendaal 2016-10-31 17:29:30 +01:00
  • faf23c3162 Changed get_datetimes to timedelta sanderroosendaal 2016-10-31 16:57:58 +01:00
  • 1806d8a36b Merge tag 'emailsubject' into develop sanderroosendaal 2016-10-31 16:37:39 +01:00
  • 21db90ffe9 Merge branch 'release/emailsubject' emailsubject sanderroosendaal 2016-10-31 16:37:19 +01:00
  • 0a0e21ae07 If name is empty, name will be set to - imported through email - sanderroosendaal 2016-10-31 16:31:54 +01:00
  • caedf5392f Merge tag 'sliders' into develop sanderroosendaal 2016-10-31 15:54:49 +01:00
  • c66b309e11 Merge branch 'release/sliders' sliders sanderroosendaal 2016-10-31 15:54:23 +01:00
  • 042a83f254 sliders final sanderroosendaal 2016-10-31 15:53:31 +01:00
  • 7fb67ff176 publishing sliders sanderroosendaal 2016-10-31 15:52:12 +01:00
  • ada6042a39 merge conflict resolved sanderroosendaal 2016-10-31 15:43:34 +01:00
  • 68579a0265 Merge branch 'feature/sliders' into develop sanderroosendaal 2016-10-31 15:36:12 +01:00
  • 0b2fc89ffb added check for non-empty dataframe sanderroosendaal 2016-10-31 15:32:53 +01:00
  • 49f93da544 Cumulative Flex Plot v1 sanderroosendaal 2016-10-31 15:18:11 +01:00
  • bb39d2b0af removed db.sqlite3 sanderroosendaal 2016-10-31 14:15:40 +01:00
  • bff31d0829 Removed some pyc files sanderroosendaal 2016-10-31 13:23:25 +01:00
  • 97cbc1b313 Removing db.sqlite3 from git sanderroosendaal 2016-10-31 13:03:00 +01:00
  • be6333081e Master` sanderroosendaal 2016-10-31 13:00:18 +01:00
  • f7ea837bcc Sliders on flex chart sanderroosendaal 2016-10-31 12:55:21 +01:00
  • 3f5f4a84df Added slider on flex plot sanderroosendaal 2016-10-31 12:51:27 +01:00
  • 20a96ee18d Added sliders to Flex Plot (including mean) sanderroosendaal 2016-10-31 12:49:10 +01:00
  • ff9a2114c2 Merge tag 'RELEASE' into develop sanderroosendaal 2016-10-30 17:55:38 +01:00
  • 6877e93e2c Merge branch 'release/RELEASE' RELEASE sanderroosendaal 2016-10-30 17:54:47 +01:00
  • 3eed3cc3e7 Uploading files sanderroosendaal 2016-10-30 17:39:32 +01:00
  • c135e98d61 Initial commit sanderroosendaal 2016-10-30 17:10:39 +01:00