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

Commit Graph

  • 61b83316fc Merge tag 'commentsfix' into develop Sander Roosendaal 2017-02-17 19:14:28 +01:00
  • 94c8f7d2ee Merge branch 'hotfix/commentsfix' Sander Roosendaal 2017-02-17 19:14:03 +01:00
  • b7b3518de2 bugfix comment notification Sander Roosendaal 2017-02-17 19:10:26 +01:00
  • 92accdfc85 Merge tag 'bugfixcomment' into develop Sander Roosendaal 2017-02-17 16:52:52 +01:00
  • d0506bf51a Merge branch 'release/bugfixcomment' Sander Roosendaal 2017-02-17 16:52:33 +01:00
  • e564d3e167 bugfix Sander Roosendaal 2017-02-17 16:51:24 +01:00
  • 025df88d25 Merge tag 'workoutcomments' into develop Sander Roosendaal 2017-02-17 16:40:34 +01:00
  • 3e844b5c50 Merge branch 'release/workoutcomments' Sander Roosendaal 2017-02-17 16:40:18 +01:00
  • 781392866a Merge branch 'feature/teammessages' into develop Sander Roosendaal 2017-02-17 16:36:41 +01:00
  • cee6179416 added comment functionality Sander Roosendaal 2017-02-17 16:35:34 +01:00
  • 53f51c456f implemented comments page Sander Roosendaal 2017-02-17 16:13:34 +01:00
  • 7ffaf18379 created WorkoutComment model Sander Roosendaal 2017-02-17 10:27:45 +01:00
  • fd10f14660 removing some strava error catching code - I want tracebacks Sander Roosendaal 2017-02-17 07:37:31 +01:00
  • 5c81734d63 strava callback catch error code Sander Roosendaal 2017-02-17 07:33:27 +01:00
  • dd280df523 Merge tag 'emptyuserform' into develop Sander Roosendaal 2017-02-16 22:22:22 +01:00
  • 1c88d89fcf Merge branch 'hotfix/emptyuserform' Sander Roosendaal 2017-02-16 22:21:32 +01:00
  • b7a031945a hotfix emtpy field on user form Sander Roosendaal 2017-02-16 22:19:30 +01:00
  • 009f358df3 added test for upload of logcard Sander Roosendaal 2017-02-16 19:24:54 +01:00
  • 274e5d953f Merge tag 'logcard' into develop Sander Roosendaal 2017-02-16 19:13:13 +01:00
  • 1781ab4e47 Merge branch 'hotfix/logcard' Sander Roosendaal 2017-02-16 19:12:36 +01:00
  • e33518bdf9 bugfix new_workout_from_file Sander Roosendaal 2017-02-16 19:11:13 +01:00
  • cce8c86e73 Merge tag 'hotfix453' into develop Sander Roosendaal 2017-02-16 15:21:42 +01:00
  • c59cfee8b2 Merge branch 'release/hotfix453' Sander Roosendaal 2017-02-16 15:20:43 +01:00
  • 993cf6128a bugfix - automatic chart creation on non-painsled upload Sander Roosendaal 2017-02-16 15:14:24 +01:00
  • b1379f8295 added tcx file export error check Sander Roosendaal 2017-02-16 09:25:15 +01:00
  • feb755908c Merge tag 'comparisonchart' into develop Sander Roosendaal 2017-02-15 19:42:32 +01:00
  • b9e95f5426 Merge branch 'hotfix/comparisonchart' Sander Roosendaal 2017-02-15 19:42:01 +01:00
  • 599ba9e9df changed comparison chart to use small_db Sander Roosendaal 2017-02-15 19:40:49 +01:00
  • 2110b6e7b1 added blank line Sander Roosendaal 2017-02-15 19:28:15 +01:00
  • 84d2978235 Merge tag 'teamcontinued' into develop Sander Roosendaal 2017-02-15 16:30:49 +01:00
  • a63280acae Merge branch 'release/teamcontinued' Sander Roosendaal 2017-02-15 16:29:24 +01:00
  • f255997dbe slight update of upload page Sander Roosendaal 2017-02-15 16:26:06 +01:00
  • 1a9cab8894 Merge branch 'feature/teamcontinued' into develop Sander Roosendaal 2017-02-15 16:17:19 +01:00
  • 5deaa194f0 making upload options sticky and adding make private Sander Roosendaal 2017-02-15 16:16:02 +01:00
  • 154619a0dc private workouts invisible, implemented coachonly workout list view Sander Roosendaal 2017-02-15 15:07:27 +01:00
  • f327f1aa8e team manager can edit workout Sander Roosendaal 2017-02-15 13:07:55 +01:00
  • 478b6f2fa0 added set private/public to workout edit form Sander Roosendaal 2017-02-15 12:58:38 +01:00
  • 4571f24dab added privacy settings to workouts & users Sander Roosendaal 2017-02-15 12:31:00 +01:00
  • 0cc080b5cf adding sharing behavior as a team setting Sander Roosendaal 2017-02-14 22:25:49 +01:00
  • 5dbb5cf6b4 Merge tag 'flexchartfavs' into develop Sander Roosendaal 2017-02-14 21:14:57 +01:00
  • 79bf717df9 Merge branch 'hotfix/flexchartfavs' Sander Roosendaal 2017-02-14 21:13:35 +01:00
  • 5fb444eb39 flexchart advance error when logged out bug fix Sander Roosendaal 2017-02-14 21:09:14 +01:00
  • 7c5100f385 Merge tag 'emailprocessing' into develop Sander Roosendaal 2017-02-14 20:54:53 +01:00
  • f1fde0d155 Merge branch 'hotfix/emailprocessing' Sander Roosendaal 2017-02-14 20:53:12 +01:00
  • 2d1cfef521 bugfix mail processing Sander Roosendaal 2017-02-14 20:52:10 +01:00
  • 4941674421 add test for new user registration Sander Roosendaal 2017-02-14 17:44:46 +01:00
  • 4858e41d0d Merge tag 'register' into develop Sander Roosendaal 2017-02-14 16:24:15 +01:00
  • af4c5dbc2b Merge branch 'hotfix/register' Sander Roosendaal 2017-02-14 16:23:41 +01:00
  • 4fb67aeb45 support for gzip file to prepare new workouts Sander Roosendaal 2017-02-14 16:22:09 +01:00
  • d98e6b029c commit Sander Roosendaal 2017-02-14 15:14:45 +01:00
  • 38afdbf7d5 Merge tag 'teamsrq' into develop Sander Roosendaal 2017-02-14 13:13:25 +01:00
  • 45f5be640f Merge branch 'hotfix/teamsrq' Sander Roosendaal 2017-02-14 13:12:51 +01:00
  • 991eebf862 cannot pickle list of teams -> Sander Roosendaal 2017-02-14 13:11:43 +01:00
  • 04a456b359 Merge tag 'teamworkoutsfix' into develop Sander Roosendaal 2017-02-14 12:48:38 +01:00
  • d63f7336c5 Merge branch 'release/teamworkoutsfix' Sander Roosendaal 2017-02-14 12:48:17 +01:00
  • 211f444908 add member small bug fix Sander Roosendaal 2017-02-14 12:44:30 +01:00
  • b28fcf6d5b Merge tag 'teamworkouts' into develop Sander Roosendaal 2017-02-14 12:29:44 +01:00
  • a9014487ca Merge branch 'release/teamworkouts' Sander Roosendaal 2017-02-14 12:28:56 +01:00
  • 2b0c4f5b06 Merge branch 'feature/teamworkouts' into develop Sander Roosendaal 2017-02-14 12:01:09 +01:00
  • e90293709d allow paging through search Sander Roosendaal 2017-02-14 11:59:29 +01:00
  • 3cf334382d link to teams page Sander Roosendaal 2017-02-14 11:08:59 +01:00
  • 253454ff3f list workouts for team members Sander Roosendaal 2017-02-14 10:50:03 +01:00
  • 9e737458b6 better filter for lowercase email addresses Sander Roosendaal 2017-02-14 08:36:15 +01:00
  • 3ae5382a62 tests for no HR data on import Strava/ST Sander Roosendaal 2017-02-14 07:54:34 +01:00
  • f9544ff50d Merge tag 'deleteconfirm' into develop Sander Roosendaal 2017-02-13 22:37:45 +01:00
  • 73c5e8917d Merge branch 'hotfix/deleteconfirm' Sander Roosendaal 2017-02-13 22:33:34 +01:00
  • 4d7006922e bug fixes - loading nonexisting workout Sander Roosendaal 2017-02-13 22:32:05 +01:00
  • 7cef6fdece bug fix Sander Roosendaal 2017-02-13 19:33:54 +01:00
  • 86b5b88d93 check for coordinates in mail processing Sander Roosendaal 2017-02-13 19:33:15 +01:00
  • 03eaea4008 Merge branch 'feature/multifilezip' into develop Sander Roosendaal 2017-02-13 19:25:37 +01:00
  • f016626002 added multi file zip support Sander Roosendaal 2017-02-13 19:21:27 +01:00
  • be3a354f01 Merge tag 'emailcheck' into develop Sander Roosendaal 2017-02-13 17:49:53 +01:00
  • 4adccd508c Merge branch 'hotfix/emailcheck' Sander Roosendaal 2017-02-13 17:48:36 +01:00
  • 00e9296cb0 email to lower check fix Sander Roosendaal 2017-02-13 17:47:29 +01:00
  • bac131917d first attempt multi zip Sander Roosendaal 2017-02-13 17:42:03 +01:00
  • 083c7e5916 small error fix in unrecognized Sander Roosendaal 2017-02-13 16:34:59 +01:00
  • 2b88be67de Merge branch 'feature/mergeworkoutcreation' into develop Sander Roosendaal 2017-02-13 16:21:30 +01:00
  • 19037a9a81 repaired celery, c2 error, finish merge Sander Roosendaal 2017-02-13 16:20:11 +01:00
  • a8656f6755 Merge tag 'resetlink' into develop Sander Roosendaal 2017-02-13 12:28:37 +01:00
  • c2a107646f Merge branch 'hotfix/resetlink' Sander Roosendaal 2017-02-13 12:28:24 +01:00
  • bf6406ab9a reset-link bugfix Sander Roosendaal 2017-02-13 12:25:53 +01:00
  • bb7652522e Merge branch 'develop' into feature/mergeworkoutcreation Sander Roosendaal 2017-02-13 11:24:10 +01:00
  • f17a43313d Merge tag 'smtpsenderrefused' into develop Sander Roosendaal 2017-02-13 11:19:55 +01:00
  • fdca48d85d Merge branch 'hotfix/smtpsenderrefused' Sander Roosendaal 2017-02-13 11:19:23 +01:00
  • 2ed59add2e set default from address Sander Roosendaal 2017-02-13 11:18:35 +01:00
  • 92c9c4f5be Merge tag 'passwordreset3' into develop Sander Roosendaal 2017-02-13 10:36:09 +01:00
  • 4baa5162e1 Merge branch 'release/passwordreset3' Sander Roosendaal 2017-02-13 10:35:44 +01:00
  • 64fb109676 added admins for bug reporting Sander Roosendaal 2017-02-13 09:55:33 +01:00
  • 6976eeb9f5 Merge tag 'passwordreset2' into develop Sander Roosendaal 2017-02-13 09:00:51 +01:00
  • 8c7c436897 Merge branch 'hotfix/passwordreset2' Sander Roosendaal 2017-02-13 09:00:29 +01:00
  • cba50bdab2 trying to bugfix passwrod reset Sander Roosendaal 2017-02-13 08:59:27 +01:00
  • 421cff33bf Merge tag 'passwordreset' into develop Sander Roosendaal 2017-02-13 08:36:53 +01:00
  • d584f1e543 Merge branch 'hotfix/passwordreset' Sander Roosendaal 2017-02-13 08:36:04 +01:00
  • 4635df09a8 redoing user password forgot functionality Sander Roosendaal 2017-02-13 08:35:10 +01:00
  • 99a44271a5 adding team to workout upon creation Sander Roosendaal 2017-02-12 21:08:38 +01:00
  • 296d69ed1c tested processemail management command Sander Roosendaal 2017-02-12 20:40:38 +01:00
  • aeef0e3a2c mailprocessing using dataprep (not tested) Sander Roosendaal 2017-02-11 17:46:15 +01:00
  • 8d9a8b0d2b Web Import now uses dataprep Sander Roosendaal 2017-02-11 15:51:42 +01:00
  • f287f9af21 moved workout creation to dataprep for workout_upload Sander Roosendaal 2017-02-11 15:03:28 +01:00
  • 97b6212161 team edit Sander Roosendaal 2017-02-11 08:18:48 +01:00