Sander Roosendaal
|
2d1cfef521
|
bugfix mail processing
|
2017-02-14 20:52:10 +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
|
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
|
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 |
|
Sander Roosendaal
|
bb7652522e
|
Merge branch 'develop' into feature/mergeworkoutcreation
|
2017-02-13 11:24:10 +01:00 |
|
Sander Roosendaal
|
f17a43313d
|
Merge tag 'smtpsenderrefused' into develop
set default from address
|
2017-02-13 11:19:55 +01:00 |
|
Sander Roosendaal
|
fdca48d85d
|
Merge branch 'hotfix/smtpsenderrefused'
|
2017-02-13 11:19:23 +01:00 |
|
Sander Roosendaal
|
2ed59add2e
|
set default from address
|
2017-02-13 11:18:35 +01:00 |
|
Sander Roosendaal
|
92c9c4f5be
|
Merge tag 'passwordreset3' into develop
password reset 3
|
2017-02-13 10:36:09 +01:00 |
|
Sander Roosendaal
|
4baa5162e1
|
Merge branch 'release/passwordreset3'
|
2017-02-13 10:35:44 +01:00 |
|
Sander Roosendaal
|
64fb109676
|
added admins for bug reporting
|
2017-02-13 09:55:33 +01:00 |
|
Sander Roosendaal
|
6976eeb9f5
|
Merge tag 'passwordreset2' into develop
password reset bugfix attempt
|
2017-02-13 09:00:51 +01:00 |
|
Sander Roosendaal
|
8c7c436897
|
Merge branch 'hotfix/passwordreset2'
|
2017-02-13 09:00:29 +01:00 |
|
Sander Roosendaal
|
cba50bdab2
|
trying to bugfix passwrod reset
|
2017-02-13 08:59:27 +01:00 |
|
Sander Roosendaal
|
421cff33bf
|
Merge tag 'passwordreset' into develop
passwordresetform
|
2017-02-13 08:36:53 +01:00 |
|
Sander Roosendaal
|
d584f1e543
|
Merge branch 'hotfix/passwordreset'
|
2017-02-13 08:36:04 +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 |
|