Sander Roosendaal
|
c19448a2c1
|
Merge branch 'hotfix/fitfiles'
|
2017-02-19 09:33:59 +01:00 |
|
Sander Roosendaal
|
35e853aea1
|
hotfix fit functionality, strava timeout, team invite
|
2017-02-19 09:29:00 +01:00 |
|
Sander Roosendaal
|
d4daa8c924
|
Merge branch 'hotfix/afewerrors'
|
2017-02-18 20:28:07 +01:00 |
|
Sander Roosendaal
|
209a9e193c
|
bugfix promember check
|
2017-02-18 20:26:36 +01:00 |
|
Sander Roosendaal
|
7cea43738c
|
Merge branch 'hotfix/stravaerror2'
|
2017-02-17 21:40:37 +01:00 |
|
Sander Roosendaal
|
901398be76
|
removing error catching in stravastuff
|
2017-02-17 21:39:28 +01:00 |
|
Sander Roosendaal
|
fc5e86c171
|
Merge branch 'hotfix/commentsfix2'
|
2017-02-17 19:27:06 +01:00 |
|
Sander Roosendaal
|
1456dc7a4b
|
bugfx2
|
2017-02-17 19:26:02 +01:00 |
|
Sander Roosendaal
|
94c8f7d2ee
|
Merge branch 'hotfix/commentsfix'
|
2017-02-17 19:14:03 +01:00 |
|
Sander Roosendaal
|
b7b3518de2
|
bugfix comment notification
|
2017-02-17 19:10:26 +01:00 |
|
Sander Roosendaal
|
d0506bf51a
|
Merge branch 'release/bugfixcomment'
|
2017-02-17 16:52:33 +01:00 |
|
Sander Roosendaal
|
e564d3e167
|
bugfix
|
2017-02-17 16:51:24 +01:00 |
|
Sander Roosendaal
|
025df88d25
|
Merge tag 'workoutcomments' into develop
added workout comments
|
2017-02-17 16:40:34 +01:00 |
|
Sander Roosendaal
|
3e844b5c50
|
Merge branch 'release/workoutcomments'
|
2017-02-17 16:40:18 +01:00 |
|
Sander Roosendaal
|
781392866a
|
Merge branch 'feature/teammessages' into develop
|
2017-02-17 16:36:41 +01:00 |
|
Sander Roosendaal
|
cee6179416
|
added comment functionality
|
2017-02-17 16:35:34 +01:00 |
|
Sander Roosendaal
|
53f51c456f
|
implemented comments page
|
2017-02-17 16:13:34 +01:00 |
|
Sander Roosendaal
|
7ffaf18379
|
created WorkoutComment model
|
2017-02-17 10:27:45 +01:00 |
|
Sander Roosendaal
|
fd10f14660
|
removing some strava error catching code - I want tracebacks
|
2017-02-17 07:37:31 +01:00 |
|
Sander Roosendaal
|
5c81734d63
|
strava callback catch error code
|
2017-02-17 07:33:27 +01:00 |
|
Sander Roosendaal
|
dd280df523
|
Merge tag 'emptyuserform' into develop
empty user form field hotfix
|
2017-02-16 22:22:22 +01:00 |
|
Sander Roosendaal
|
1c88d89fcf
|
Merge branch 'hotfix/emptyuserform'
|
2017-02-16 22:21:32 +01:00 |
|
Sander Roosendaal
|
b7a031945a
|
hotfix emtpy field on user form
|
2017-02-16 22:19:30 +01:00 |
|
Sander Roosendaal
|
009f358df3
|
added test for upload of logcard
|
2017-02-16 19:24:54 +01:00 |
|
Sander Roosendaal
|
274e5d953f
|
Merge tag 'logcard' into develop
bug hotfix c2 logcard summary
|
2017-02-16 19:13:13 +01:00 |
|
Sander Roosendaal
|
1781ab4e47
|
Merge branch 'hotfix/logcard'
|
2017-02-16 19:12:36 +01:00 |
|
Sander Roosendaal
|
e33518bdf9
|
bugfix new_workout_from_file
|
2017-02-16 19:11:13 +01:00 |
|
Sander Roosendaal
|
cce8c86e73
|
Merge tag 'hotfix453' into develop
hotfix chart creation on upload
|
2017-02-16 15:21:42 +01:00 |
|
Sander Roosendaal
|
c59cfee8b2
|
Merge branch 'release/hotfix453'
|
2017-02-16 15:20:43 +01:00 |
|
Sander Roosendaal
|
993cf6128a
|
bugfix - automatic chart creation on non-painsled upload
|
2017-02-16 15:14:24 +01:00 |
|
Sander Roosendaal
|
b1379f8295
|
added tcx file export error check
|
2017-02-16 09:25:15 +01:00 |
|
Sander Roosendaal
|
feb755908c
|
Merge tag 'comparisonchart' into develop
comparison chart hotfix attempt
|
2017-02-15 19:42:32 +01:00 |
|
Sander Roosendaal
|
b9e95f5426
|
Merge branch 'hotfix/comparisonchart'
|
2017-02-15 19:42:01 +01:00 |
|
Sander Roosendaal
|
599ba9e9df
|
changed comparison chart to use small_db
|
2017-02-15 19:40:49 +01:00 |
|
Sander Roosendaal
|
2110b6e7b1
|
added blank line
adding blank lines is good
|
2017-02-15 19:28:15 +01:00 |
|
Sander Roosendaal
|
84d2978235
|
Merge tag 'teamcontinued' into develop
More team related functionality
|
2017-02-15 16:30:49 +01:00 |
|
Sander Roosendaal
|
a63280acae
|
Merge branch 'release/teamcontinued'
|
2017-02-15 16:29:24 +01:00 |
|
Sander Roosendaal
|
f255997dbe
|
slight update of upload page
|
2017-02-15 16:26:06 +01:00 |
|
Sander Roosendaal
|
1a9cab8894
|
Merge branch 'feature/teamcontinued' into develop
|
2017-02-15 16:17:19 +01:00 |
|
Sander Roosendaal
|
5deaa194f0
|
making upload options sticky and adding make private
|
2017-02-15 16:16:02 +01:00 |
|
Sander Roosendaal
|
154619a0dc
|
private workouts invisible, implemented coachonly workout list view
|
2017-02-15 15:07:27 +01:00 |
|
Sander Roosendaal
|
f327f1aa8e
|
team manager can edit workout
|
2017-02-15 13:07:55 +01:00 |
|
Sander Roosendaal
|
478b6f2fa0
|
added set private/public to workout edit form
|
2017-02-15 12:58:38 +01:00 |
|
Sander Roosendaal
|
4571f24dab
|
added privacy settings to workouts & users
|
2017-02-15 12:31:00 +01:00 |
|
Sander Roosendaal
|
0cc080b5cf
|
adding sharing behavior as a team setting
|
2017-02-14 22:25:49 +01:00 |
|
Sander Roosendaal
|
5dbb5cf6b4
|
Merge tag 'flexchartfavs' into develop
bugfix flexchart
|
2017-02-14 21:14:57 +01:00 |
|
Sander Roosendaal
|
79bf717df9
|
Merge branch 'hotfix/flexchartfavs'
|
2017-02-14 21:13:35 +01:00 |
|
Sander Roosendaal
|
5fb444eb39
|
flexchart advance error when logged out bug fix
|
2017-02-14 21:09:14 +01:00 |
|
Sander Roosendaal
|
7c5100f385
|
Merge tag 'emailprocessing' into develop
mailprocessing bugfix
|
2017-02-14 20:54:53 +01:00 |
|
Sander Roosendaal
|
f1fde0d155
|
Merge branch 'hotfix/emailprocessing'
|
2017-02-14 20:53:12 +01:00 |
|