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 |
|
Sander Roosendaal
|
51b97f6821
|
Merge branch 'feature/team_management' into develop
|
2017-02-09 20:49:59 +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 |
|
Sander Roosendaal
|
30f420c1a5
|
Merge branch 'feature/team_lowlevel' into develop
|
2017-02-09 13:31:28 +01:00 |
|
Sander Roosendaal
|
887e7de53d
|
added teams and invitations placeholder views
|
2017-02-09 13:27:45 +01:00 |
|
Sander Roosendaal
|
f393862a92
|
medium level and account page
|
2017-02-09 12:23:56 +01:00 |
|
Sander Roosendaal
|
0969399e36
|
moved data field prep for stats to dataprep from views
|
2017-02-09 08:43:07 +01:00 |
|
Sander Roosendaal
|
d279180d5d
|
low level team functions
|
2017-02-08 18:49:48 +01:00 |
|
Sander Roosendaal
|
7e5d751aef
|
model changes to support team
|
2017-02-08 15:42:11 +01:00 |
|
Sander Roosendaal
|
75a37ff642
|
added gzip to OTW power calc
|
2017-02-08 11:30:42 +01:00 |
|
Sander Roosendaal
|
6348c67a71
|
Merge tag 'stats_v5' into develop
stats_v5
|
2017-02-07 18:05:09 +01:00 |
|
Sander Roosendaal
|
d9d8cea995
|
Merge branch 'release/stats_v5'
|
2017-02-07 18:03:18 +01:00 |
|
Sander Roosendaal
|
20e13ca641
|
Merge branch 'feature/stats_v5' into develop
|
2017-02-07 17:55:32 +01:00 |
|
Sander Roosendaal
|
97e6ad5d27
|
changed Team model
|
2017-02-07 17:54:47 +01:00 |
|
Sander Roosendaal
|
abcf2f1789
|
using sessions to keep workout type selected
|
2017-02-07 15:54:07 +01:00 |
|
Sander Roosendaal
|
2fc2431de9
|
Merge tag 'otwpower' into develop
OTW power plot fixed
|
2017-02-07 13:30:03 +01:00 |
|
Sander Roosendaal
|
9735221b3b
|
Merge branch 'release/otwpower'
|
2017-02-07 13:29:21 +01:00 |
|
Sander Roosendaal
|
6c7180dd02
|
bug fix power plot (expecting serialized value)
|
2017-02-07 13:15:32 +01:00 |
|
Sander Roosendaal
|
0d0d70a49c
|
Merge tag 'rq-dashboard' into develop
added rq-dashboard
|
2017-02-07 12:58:28 +01:00 |
|
Sander Roosendaal
|
30f792178f
|
Merge branch 'release/rq-dashboard'
|
2017-02-07 12:58:09 +01:00 |
|
Sander Roosendaal
|
5738de3f99
|
added RQ dashboard to admin
|
2017-02-07 12:48:47 +01:00 |
|
Sander Roosendaal
|
5e4f22be9d
|
changed correlation to Spearman
|
2017-02-07 11:53:52 +01:00 |
|
Sander Roosendaal
|
f1967a9d5f
|
Merge tag 'stats_v4' into develop
improved stats page
|
2017-02-07 11:27:03 +01:00 |
|
Sander Roosendaal
|
05a5d693ce
|
Merge branch 'release/stats_v4'
|
2017-02-07 11:26:45 +01:00 |
|