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 |
|
Sander Roosendaal
|
2d1cfef521
|
bugfix mail processing
|
2017-02-14 20:52:10 +01:00 |
|
Sander Roosendaal
|
4941674421
|
add test for new user registration
|
2017-02-14 17:44:46 +01:00 |
|
Sander Roosendaal
|
4858e41d0d
|
Merge tag 'register' into develop
gzip support
|
2017-02-14 16:24:15 +01:00 |
|
Sander Roosendaal
|
af4c5dbc2b
|
Merge branch 'hotfix/register'
|
2017-02-14 16:23:41 +01:00 |
|
Sander Roosendaal
|
4fb67aeb45
|
support for gzip file to prepare new workouts
|
2017-02-14 16:22:09 +01:00 |
|
Sander Roosendaal
|
d98e6b029c
|
commit
|
2017-02-14 15:14:45 +01:00 |
|
Sander Roosendaal
|
38afdbf7d5
|
Merge tag 'teamsrq' into develop
bugfix team creation
|
2017-02-14 13:13:25 +01:00 |
|
Sander Roosendaal
|
45f5be640f
|
Merge branch 'hotfix/teamsrq'
|
2017-02-14 13:12:51 +01:00 |
|
Sander Roosendaal
|
991eebf862
|
cannot pickle list of teams ->
|
2017-02-14 13:11:43 +01:00 |
|
Sander Roosendaal
|
04a456b359
|
Merge tag 'teamworkoutsfix' into develop
bugfix add member to team
|
2017-02-14 12:48:38 +01:00 |
|
Sander Roosendaal
|
d63f7336c5
|
Merge branch 'release/teamworkoutsfix'
|
2017-02-14 12:48:17 +01:00 |
|
Sander Roosendaal
|
211f444908
|
add member small bug fix
|
2017-02-14 12:44:30 +01:00 |
|
Sander Roosendaal
|
b28fcf6d5b
|
Merge tag 'teamworkouts' into develop
Adding a team recent workout view
|
2017-02-14 12:29:44 +01:00 |
|
Sander Roosendaal
|
a9014487ca
|
Merge branch 'release/teamworkouts'
|
2017-02-14 12:28:56 +01:00 |
|
Sander Roosendaal
|
2b0c4f5b06
|
Merge branch 'feature/teamworkouts' into develop
|
2017-02-14 12:01:09 +01:00 |
|
Sander Roosendaal
|
e90293709d
|
allow paging through search
|
2017-02-14 11:59:29 +01:00 |
|
Sander Roosendaal
|
3cf334382d
|
link to teams page
|
2017-02-14 11:08:59 +01:00 |
|
Sander Roosendaal
|
253454ff3f
|
list workouts for team members
|
2017-02-14 10:50:03 +01:00 |
|
Sander Roosendaal
|
9e737458b6
|
better filter for lowercase email addresses
|
2017-02-14 08:36:15 +01:00 |
|
Sander Roosendaal
|
3ae5382a62
|
tests for no HR data on import Strava/ST
|
2017-02-14 07:54:34 +01:00 |
|
Sander Roosendaal
|
f9544ff50d
|
Merge tag 'deleteconfirm' into develop
raise error404 in a few places
|
2017-02-13 22:37:45 +01:00 |
|
Sander Roosendaal
|
73c5e8917d
|
Merge branch 'hotfix/deleteconfirm'
|
2017-02-13 22:33:34 +01:00 |
|
Sander Roosendaal
|
4d7006922e
|
bug fixes - loading nonexisting workout
|
2017-02-13 22:32:05 +01:00 |
|
Sander Roosendaal
|
7cef6fdece
|
bug fix
|
2017-02-13 19:33:54 +01:00 |
|
Sander Roosendaal
|
86b5b88d93
|
check for coordinates in mail processing
|
2017-02-13 19:33:15 +01:00 |
|
Sander Roosendaal
|
03eaea4008
|
Merge branch 'feature/multifilezip' into develop
|
2017-02-13 19:25:37 +01:00 |
|
Sander Roosendaal
|
f016626002
|
added multi file zip support
|
2017-02-13 19:21:27 +01:00 |
|
Sander Roosendaal
|
be3a354f01
|
Merge tag 'emailcheck' into develop
lowercase comparison emails
|
2017-02-13 17:49:53 +01:00 |
|
Sander Roosendaal
|
4adccd508c
|
Merge branch 'hotfix/emailcheck'
|
2017-02-13 17:48:36 +01:00 |
|
Sander Roosendaal
|
00e9296cb0
|
email to lower check fix
|
2017-02-13 17:47:29 +01:00 |
|
Sander Roosendaal
|
bac131917d
|
first attempt multi zip
|
2017-02-13 17:42:03 +01:00 |
|
Sander Roosendaal
|
083c7e5916
|
small error fix in unrecognized
|
2017-02-13 16:34:59 +01:00 |
|
Sander Roosendaal
|
2b88be67de
|
Merge branch 'feature/mergeworkoutcreation' into develop
|
2017-02-13 16:21:30 +01:00 |
|
Sander Roosendaal
|
19037a9a81
|
repaired celery, c2 error, finish merge
|
2017-02-13 16:20:11 +01:00 |
|
Sander Roosendaal
|
a8656f6755
|
Merge tag 'resetlink' into develop
resetlink fix
|
2017-02-13 12:28:37 +01:00 |
|
Sander Roosendaal
|
c2a107646f
|
Merge branch 'hotfix/resetlink'
|
2017-02-13 12:28:24 +01:00 |
|
Sander Roosendaal
|
bf6406ab9a
|
reset-link bugfix
|
2017-02-13 12:25:53 +01:00 |
|