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

Commit Graph

  • 5cbd28a26d Merge tag 'v1.93' into develop Sander Roosendaal 2017-04-07 08:37:33 +02:00
  • 16391338eb Merge branch 'hotfix/v1.93' Sander Roosendaal 2017-04-07 08:25:21 +02:00
  • 8658176cc9 some error catching around has-teams and api permissions Sander Roosendaal 2017-04-07 08:24:10 +02:00
  • b90b5960bd Merge branch 'feature/redesign2' into develop Sander Roosendaal 2017-04-06 23:14:54 +02:00
  • 06aa14d38f redesign 2 part 2 front page Sander Roosendaal 2017-04-06 23:05:20 +02:00
  • f7795eaf1d redesign part I base.html Sander Roosendaal 2017-04-06 23:00:01 +02:00
  • d5353caab7 Merge branch 'develop' into feature/redesign2 Sander Roosendaal 2017-04-06 22:36:28 +02:00
  • 6e1268fd31 Merge tag 'v1.92' into develop Sander Roosendaal 2017-04-06 22:32:38 +02:00
  • 70fdd5452e Merge branch 'hotfix/v1.92' Sander Roosendaal 2017-04-06 22:29:18 +02:00
  • 3b95572689 removed teams from reverse calls Sander Roosendaal 2017-04-06 22:28:13 +02:00
  • ee12f8caaa dataprep Sander Roosendaal 2017-04-06 22:23:56 +02:00
  • ffd198dd23 Merge tag 'v1.91' into develop Sander Roosendaal 2017-04-06 22:05:50 +02:00
  • 83b2e65974 Merge branch 'hotfix/v1.91' Sander Roosendaal 2017-04-06 22:05:13 +02:00
  • 811f1a65ab added teams button if you are not team member Sander Roosendaal 2017-04-06 22:01:35 +02:00
  • 979cf48618 new logo Sander Roosendaal 2017-04-06 15:37:57 +02:00
  • 8306d5d2d9 Merge tag 'v1.90' into develop Sander Roosendaal 2017-04-06 08:40:40 +02:00
  • 6c0fa1efc2 Merge branch 'hotfix/v1.90' Sander Roosendaal 2017-04-06 08:40:16 +02:00
  • f42468b2a4 ranking duration > 1hr bug fixed Sander Roosendaal 2017-04-06 08:35:29 +02:00
  • 33cd6b6713 Merge tag 'v1.89' into develop Sander Roosendaal 2017-04-05 11:39:39 +02:00
  • f42425f07c Merge branch 'hotfix/v1.89' Sander Roosendaal 2017-04-05 11:39:09 +02:00
  • 3951b3f764 bug fix recalc stats for nonexisting row Sander Roosendaal 2017-04-05 11:37:44 +02:00
  • 7190567b2f Merge branch 'feature/newlogo' into develop Sander Roosendaal 2017-04-05 10:52:37 +02:00
  • 6366c89911 updated layout Sander Roosendaal 2017-04-05 10:51:54 +02:00
  • f76e3efa32 first attempt at landing page Sander Roosendaal 2017-04-04 23:14:22 +02:00
  • acc4fc3c31 removed all gradients from buttons Sander Roosendaal 2017-04-04 21:06:16 +02:00
  • dc499dbda4 sharp cornered buttons Sander Roosendaal 2017-04-04 20:37:19 +02:00
  • 943346b23b new logo testing Sander Roosendaal 2017-04-04 20:17:55 +02:00
  • 421ca7a877 Merge tag 'v1.88' into develop Sander Roosendaal 2017-04-03 20:12:13 +02:00
  • 468d9bcb11 Merge branch 'hotfix/v1.88' Sander Roosendaal 2017-04-03 20:09:54 +02:00
  • 07a3ba6c1c error catching around non painsled parsers Sander Roosendaal 2017-04-03 20:02:49 +02:00
  • 826e5db8e7 Merge tag 'v1.87' into develop Sander Roosendaal 2017-04-01 15:51:17 +02:00
  • 6da296365d Merge branch 'hotfix/v1.87' Sander Roosendaal 2017-04-01 15:50:05 +02:00
  • 3e79336fc8 Strava import - imported time instead of distance Sander Roosendaal 2017-04-01 15:49:14 +02:00
  • 330d78ba2b Merge tag 'v1.86' into develop Sander Roosendaal 2017-03-30 22:13:46 +02:00
  • 9fec0ebd03 Merge branch 'hotfix/v1.86' Sander Roosendaal 2017-03-30 22:12:52 +02:00
  • c5f7973dbf bugfix email for painsled files Sander Roosendaal 2017-03-30 22:11:42 +02:00
  • a4a8213b86 Merge tag 'v1.85' into develop Sander Roosendaal 2017-03-30 15:01:06 +02:00
  • bc2fb8712d Merge branch 'hotfix/v1.85' Sander Roosendaal 2017-03-30 13:46:34 +02:00
  • 3131a9fdab improved partners text and bugfix on cumstats page Sander Roosendaal 2017-03-30 13:41:31 +02:00
  • cc79ed1005 Merge tag 'v1.84' into develop Sander Roosendaal 2017-03-29 12:54:02 +02:00
  • 9a5c2f1834 Merge branch 'release/v1.84' Sander Roosendaal 2017-03-29 12:53:34 +02:00
  • 200ea43ae1 Merge branch 'feature/partnerpage' into develop Sander Roosendaal 2017-03-29 11:22:58 +02:00
  • c692f4f7b5 initial text of partnership page Sander Roosendaal 2017-03-29 11:20:03 +02:00
  • c621af57f7 Merge branch 'develop' into feature/partnerpage Sander Roosendaal 2017-03-28 15:55:26 +02:00
  • b3301402f7 Merge tag 'v1.83' into develop Sander Roosendaal 2017-03-28 14:53:40 +02:00
  • 5cec9cf4a8 Merge branch 'hotfix/v1.83' Sander Roosendaal 2017-03-28 14:53:18 +02:00
  • 61df4685ce improved mail processing (zip) Sander Roosendaal 2017-03-28 14:52:20 +02:00
  • 82f31c2c43 Merge tag 'v1.82' into develop Sander Roosendaal 2017-03-28 14:04:12 +02:00
  • 4d9131c68b Merge branch 'hotfix/v1.82' Sander Roosendaal 2017-03-28 14:03:19 +02:00
  • c0a3e7b994 link to google analytics js Sander Roosendaal 2017-03-28 14:02:31 +02:00
  • 3923f69933 nothing Sander Roosendaal 2017-03-28 14:01:37 +02:00
  • 0b51a7d519 first version of partnerparge Sander Roosendaal 2017-03-28 13:12:50 +02:00
  • 9b2a2deec3 Merge tag 'v1.81' into develop Sander Roosendaal 2017-03-28 10:05:07 +02:00
  • cdad417a20 Merge branch 'hotfix/v1.81' Sander Roosendaal 2017-03-28 10:04:52 +02:00
  • 294d18662b fixed zip file Sander Roosendaal 2017-03-28 10:04:04 +02:00
  • 36f13cb0a4 Merge tag 'v1.8' into develop Sander Roosendaal 2017-03-28 08:02:17 +02:00
  • b00f924c24 Merge branch 'release/v1.8' Sander Roosendaal 2017-03-28 08:01:50 +02:00
  • a13bed1205 added Google Analytics Sander Roosendaal 2017-03-28 07:53:46 +02:00
  • d8c5454ac4 Merge tag 'v1.71' into develop Sander Roosendaal 2017-03-24 19:30:07 +01:00
  • f3f92af1cf Merge branch 'hotfix/v1.71' Sander Roosendaal 2017-03-24 19:29:42 +01:00
  • 60a26f2d6f hotfix export page (RK token) Sander Roosendaal 2017-03-24 19:29:00 +01:00
  • bf2eb72fe4 Merge tag 'v1.7' into develop Sander Roosendaal 2017-03-24 11:36:38 +01:00
  • a03d168b28 Merge branch 'release/v1.7' Sander Roosendaal 2017-03-24 11:08:12 +01:00
  • 89f33ea804 completed functionality and tested Sander Roosendaal 2017-03-24 10:49:54 +01:00
  • 44afa5ef47 Merge branch 'feature/runkeeper' into develop Sander Roosendaal 2017-03-23 21:41:34 +01:00
  • 9573f60d3a added RunKeeper to export page Sander Roosendaal 2017-03-23 21:11:54 +01:00
  • 08c0838d85 runkeeper functionality complete (not fully tested) Sander Roosendaal 2017-03-23 20:07:10 +01:00
  • d89219a2df working on workout import (auth and workout list done) Sander Roosendaal 2017-03-22 15:55:13 +01:00
  • 01fe1e8807 added receiver on Rower change (removes teams) Sander Roosendaal 2017-03-22 12:23:26 +01:00
  • bb23251c79 Merge tag 'v1.63' into develop Sander Roosendaal 2017-03-21 19:02:48 +01:00
  • cb3a25ae5a Merge branch 'hotfix/v1.63' Sander Roosendaal 2017-03-21 19:02:02 +01:00
  • fd91d34af9 fix zero or blank value in date form ote-bests view Sander Roosendaal 2017-03-21 19:01:03 +01:00
  • a84c223033 remove password from registration email Sander Roosendaal 2017-03-19 21:04:42 +01:00
  • c25814a376 Merge tag 'v1.62' into develop Sander Roosendaal 2017-03-12 23:34:41 +01:00
  • d9c696fb14 Merge branch 'hotfix/v1.62' Sander Roosendaal 2017-03-12 23:34:10 +01:00
  • 5a06fdcea6 fix in comments Sander Roosendaal 2017-03-12 23:33:24 +01:00
  • 48ef0e65cd Merge tag 'v1.61' into develop Sander Roosendaal 2017-03-12 23:22:56 +01:00
  • 1e25153a0f Merge branch 'hotfix/v1.61' Sander Roosendaal 2017-03-12 23:22:31 +01:00
  • 88348e3109 removed #tasks.py# Sander Roosendaal 2017-03-12 23:21:46 +01:00
  • a1023884bd bug fix in C2 upload Sander Roosendaal 2017-03-12 23:21:18 +01:00
  • 9bb1fb9d72 removed #tasks.py file Sander Roosendaal 2017-03-12 22:36:26 +01:00
  • d8cf24e476 Merge tag 'v1.6' into develop Sander Roosendaal 2017-03-12 22:34:39 +01:00
  • d9e9fbcdcd Merge branch 'release/v1.6' Sander Roosendaal 2017-03-12 22:34:23 +01:00
  • d670cdf0f7 Merge tag 'v1.55' into develop Sander Roosendaal 2017-03-12 22:21:26 +01:00
  • a188e90d8d Merge branch 'hotfix/v1.55' Sander Roosendaal 2017-03-12 22:19:06 +01:00
  • 96cb7f4054 v1.55 Sander Roosendaal 2017-03-12 22:18:11 +01:00
  • 245d6597c0 Merge branch 'feature/sensorfusion' into develop Sander Roosendaal 2017-03-12 22:08:06 +01:00
  • b2ce05f348 Fusion Metrics form only shows metrics that are available Sander Roosendaal 2017-03-12 10:54:19 +01:00
  • d9f59011b3 added buttons to fusion Sander Roosendaal 2017-03-12 09:48:13 +01:00
  • 1e5d0a0b83 strava import now time based Sander Roosendaal 2017-03-09 23:47:24 +01:00
  • 71bded30c0 strava import - some improvements Sander Roosendaal 2017-03-09 23:17:39 +01:00
  • 39b80b6716 data fusion now working ... Sander Roosendaal 2017-03-09 17:56:48 +01:00
  • ba8c9dfddb Merge branch 'develop' into feature/sensorfusion Sander Roosendaal 2017-03-09 15:50:08 +01:00
  • 14ac9ffb42 Merge tag 'v1.54' into develop Sander Roosendaal 2017-03-09 15:33:50 +01:00
  • 4d1863ac81 Merge branch 'hotfix/v1.54' Sander Roosendaal 2017-03-09 15:33:23 +01:00
  • b712d54dcb added y axes for distance - multi compare Sander Roosendaal 2017-03-09 13:58:45 +01:00
  • a98a9b1178 fixed strava import errors Sander Roosendaal 2017-03-09 12:58:28 +01:00
  • 0030787453 nothing Sander Roosendaal 2017-03-09 12:39:07 +01:00
  • 1dcfbb067c non working version Sander Roosendaal 2017-03-09 12:38:37 +01:00
  • 5be668ebf0 Merge branch 'develop' into feature/sensorfusion Sander Roosendaal 2017-03-08 16:12:41 +01:00