Private
Public Access
1
0
Commit Graph

327 Commits

Author SHA1 Message Date
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
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
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
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
991eebf862 cannot pickle list of teams -> 2017-02-14 13:11:43 +01:00
Sander Roosendaal
211f444908 add member small bug fix 2017-02-14 12:44:30 +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
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
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
19037a9a81 repaired celery, c2 error, finish merge 2017-02-13 16:20:11 +01:00
Sander Roosendaal
bb7652522e Merge branch 'develop' into feature/mergeworkoutcreation 2017-02-13 11:24:10 +01:00
Sander Roosendaal
421cff33bf Merge tag 'passwordreset' into develop
passwordresetform
2017-02-13 08:36:53 +01:00
Sander Roosendaal
4635df09a8 redoing user password forgot functionality 2017-02-13 08:35:10 +01:00
Sander Roosendaal
99a44271a5 adding team to workout upon creation 2017-02-12 21:08:38 +01:00
Sander Roosendaal
296d69ed1c tested processemail management command 2017-02-12 20:40:38 +01:00
Sander Roosendaal
aeef0e3a2c mailprocessing using dataprep (not tested) 2017-02-11 17:46:15 +01:00
Sander Roosendaal
8d9a8b0d2b Web Import now uses dataprep 2017-02-11 15:51:42 +01:00
Sander Roosendaal
f287f9af21 moved workout creation to dataprep for workout_upload 2017-02-11 15:03:28 +01:00
Sander Roosendaal
97b6212161 team edit 2017-02-11 08:18:48 +01:00
Sander Roosendaal
86a2127a4e bugfix for basic users 2017-02-10 19:58:45 +01:00
Sander Roosendaal
288bac995b Checks for users with that email address 2017-02-10 16:27:19 +01:00
Sander Roosendaal
70d4050bc9 updated selector & warning on invitations 2017-02-10 16:16:50 +01:00
Sander Roosendaal
90a177b06c bugfix teamrequests 2017-02-10 14:55:15 +01:00
Sander Roosendaal
88217f05ce confirmation emails 2017-02-10 13:54:23 +01:00
Sander Roosendaal
fa86c0c9d5 added requests, revoke and reject buttons 2017-02-10 12:48:22 +01:00
Sander Roosendaal
43403e261a fix messaging 2017-02-09 21:37:19 +01:00
Sander Roosendaal
5f97554bc6 indentation error fixed 2017-02-09 21:29:40 +01:00
Sander Roosendaal
c06dd204d0 buxfix 2017-02-09 21:17:24 +01:00
Sander Roosendaal
9e147528a4 bug fix 2017-02-09 20:55:07 +01:00
Sander Roosendaal
e60320143a Process team invites 2017-02-09 20:45:10 +01:00
Sander Roosendaal
32cadef2e5 bug fix 2017-02-09 17:56:03 +01:00
Sander Roosendaal
40e18fee21 Team create, delete, leave, create invite 2017-02-09 17:50:32 +01:00
Sander Roosendaal
f459cea2bd team expiry date added to Rower model 2017-02-09 14:07:44 +01:00