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
|
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 |
|
Sander Roosendaal
|
97b6212161
|
team edit
|
2017-02-11 08:18:48 +01:00 |
|
Sander Roosendaal
|
06eff02eb5
|
Merge branch 'bugfix/powerintervals' into develop
|
2017-02-11 07:32:57 +01:00 |
|
Sander Roosendaal
|
3fb82307ad
|
testje compleet
|
2017-02-11 07:32:10 +01:00 |
|
Sander Roosendaal
|
c512a19fd7
|
testje
|
2017-02-11 07:31:27 +01:00 |
|
Sander Roosendaal
|
4d971015c6
|
Merge tag 'teampagebugfix' into develop
bugfix team page
|
2017-02-10 20:03:45 +01:00 |
|
Sander Roosendaal
|
ca60f615ae
|
Merge branch 'release/teampagebugfix'
|
2017-02-10 20:02:47 +01:00 |
|
Sander Roosendaal
|
86a2127a4e
|
bugfix for basic users
|
2017-02-10 19:58:45 +01:00 |
|
Sander Roosendaal
|
07d152e76b
|
Merge tag 'teamrequestfix2' into develop
bugfixes
|
2017-02-10 16:29:07 +01:00 |
|
Sander Roosendaal
|
b387927b95
|
Merge branch 'hotfix/teamrequestfix2'
|
2017-02-10 16:28:36 +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
|
06c2ffb5cc
|
Merge tag 'teamrequestsfix' into develop
teamrequests fix
|
2017-02-10 14:59:46 +01:00 |
|
Sander Roosendaal
|
6e6205d739
|
Merge branch 'release/teamrequestsfix'
|
2017-02-10 14:59:26 +01:00 |
|
Sander Roosendaal
|
90a177b06c
|
bugfix teamrequests
|
2017-02-10 14:55:15 +01:00 |
|
Sander Roosendaal
|
c578f350ce
|
Merge tag 'teamrequests' into develop
team requests
|
2017-02-10 14:09:04 +01:00 |
|
Sander Roosendaal
|
f3cb364ce3
|
Merge branch 'release/teamrequests'
|
2017-02-10 14:01:06 +01:00 |
|
Sander Roosendaal
|
7858e9956f
|
Merge branch 'feature/teamrequests' into develop
|
2017-02-10 13:55:16 +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
|
fffdb89a53
|
Merge tag 'teamfix3' into develop
messaging fix
|
2017-02-09 21:39:32 +01:00 |
|
Sander Roosendaal
|
1b9699242d
|
Merge branch 'release/teamfix3'
|
2017-02-09 21:39:06 +01:00 |
|
Sander Roosendaal
|
43403e261a
|
fix messaging
|
2017-02-09 21:37:19 +01:00 |
|
Sander Roosendaal
|
2c9f0fac27
|
Merge tag 'teamfix2' into develop
indentation fix
|
2017-02-09 21:31:31 +01:00 |
|
Sander Roosendaal
|
db00c305a7
|
Merge branch 'release/teamfix2'
|
2017-02-09 21:31:06 +01:00 |
|
Sander Roosendaal
|
5f97554bc6
|
indentation error fixed
|
2017-02-09 21:29:40 +01:00 |
|
Sander Roosendaal
|
5e7b36f87b
|
Merge tag 'teamfix' into develop
bug fix
|
2017-02-09 21:21:05 +01:00 |
|
Sander Roosendaal
|
c5f377c074
|
Merge branch 'release/teamfix'
|
2017-02-09 21:20:39 +01:00 |
|
Sander Roosendaal
|
c06dd204d0
|
buxfix
|
2017-02-09 21:17:24 +01:00 |
|
Sander Roosendaal
|
08f1b0a127
|
Merge tag 'team_management' into develop
team management
|
2017-02-09 20:59:32 +01:00 |
|
Sander Roosendaal
|
560698a5d1
|
Merge branch 'release/team_management'
|
2017-02-09 20:59:18 +01:00 |
|
Sander Roosendaal
|
9e147528a4
|
bug fix
|
2017-02-09 20:55:07 +01:00 |
|