Private
Public Access
1
0
Commit Graph

4215 Commits

Author SHA1 Message Date
Sander Roosendaal
6665ba2fe8 added future to views 2019-02-25 16:51:41 +01:00
Sander Roosendaal
7ccb7d402d added future in rowers folder 2019-02-25 16:47:50 +01:00
Sander Roosendaal
cc94f34b6a Merge branch 'hotfix/v9.33' into develop 2019-02-25 16:26:37 +01:00
Sander Roosendaal
1275b572e5 bug fix request emails 2019-02-25 16:26:13 +01:00
Sander Roosendaal
7da6d5ff34 Merge branch 'feature/python3' into develop 2019-02-24 20:38:22 +01:00
Sander Roosendaal
712e89c885 passing tests 2019-02-24 20:38:07 +01:00
Sander Roosendaal
996d96e359 Merge branch 'hotfix/v9.32' into develop 2019-02-24 20:14:35 +01:00
Sander Roosendaal
0194ede1d5 Merge branch 'hotfix/v9.32' 2019-02-24 20:14:27 +01:00
Sander Roosendaal
badb7e0149 coachee request mail improvement 2019-02-24 20:14:09 +01:00
Sander Roosendaal
8d28a3f4a7 passed tests 2019-02-24 16:09:01 +01:00
Sander Roosendaal
3b7d75c994 some py3 related changes - passes checks on py2 2019-02-24 16:04:35 +01:00
Sander Roosendaal
866566172c passes checks in python3 2019-02-24 15:57:26 +01:00
Sander Roosendaal
c7ec31344b Merge branch 'release/v9.31' into develop 2019-02-24 11:17:56 +01:00
Sander Roosendaal
1dbcd3ec31 Merge branch 'release/v9.31' 2019-02-24 11:17:50 +01:00
Sander Roosendaal
29108bc719 tested 2019-02-24 11:17:36 +01:00
Sander Roosendaal
c9605db1f5 changing paid plans page 2019-02-24 11:13:17 +01:00
Sander Roosendaal
7cdce4db8b Merge branch 'release/v9.30' into develop 2019-02-23 15:57:41 +01:00
Sander Roosendaal
9092fc76f2 Merge branch 'release/v9.30' 2019-02-23 15:57:30 +01:00
Sander Roosendaal
f458d55f7b tested 2019-02-23 15:57:18 +01:00
Sander Roosendaal
72ab545979 passing tests 2019-02-23 15:49:47 +01:00
Sander Roosendaal
6cd745379f some bug fixes 2019-02-23 15:29:47 +01:00
Sander Roosendaal
9642e8e2a2 Merge branch 'release/v9.29' into develop 2019-02-22 21:15:02 +01:00
Sander Roosendaal
2ffc083149 Merge branch 'release/v9.29' 2019-02-22 21:14:50 +01:00
Sander Roosendaal
848ea221c1 tested 2019-02-22 21:14:37 +01:00
Sander Roosendaal
fd0f6a9dc9 Merge branch 'feature/coachingmode' into develop 2019-02-22 21:08:55 +01:00
Sander Roosendaal
2271eae72a a few small improvements 2019-02-22 21:08:38 +01:00
Sander Roosendaal
631164f4ef updated paid plans page 2019-02-22 18:59:41 +01:00
Sander Roosendaal
fb2d193ed5 bugfix new comment email 2019-02-22 15:28:02 +01:00
Sander Roosendaal
0d1884962b list view improved 2019-02-22 13:51:08 +01:00
Sander Roosendaal
e0c6e8d449 bug fix 2019-02-22 08:59:57 +01:00
Sander Roosendaal
3d67eeb114 typo correction 2019-02-21 20:35:48 +01:00
Sander Roosendaal
454abb63a6 Merge branch 'feature/clubsize' into develop 2019-02-21 20:27:01 +01:00
Sander Roosendaal
2c3d9532b0 reinstalling club size 2019-02-21 20:26:44 +01:00
Sander Roosendaal
fe59ead06b reinstated club sizes 2019-02-21 19:56:33 +01:00
Sander Roosendaal
7e46f6d6f3 Merge branch 'release/v9.28' into develop 2019-02-21 18:10:28 +01:00
Sander Roosendaal
8161b36a61 Merge branch 'release/v9.28' 2019-02-21 18:10:19 +01:00
Sander Roosendaal
828453f743 tested 2019-02-21 18:10:07 +01:00
Sander Roosendaal
e217446b31 closing payments page for coaches 2019-02-21 17:51:51 +01:00
Sander Roosendaal
7fd8a110eb Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-02-21 09:18:42 +01:00
Sander Roosendaal
b0558b6eaa bugfix get_coachees 2019-02-21 09:18:05 +01:00
Sander Roosendaal
a34ed3ebf0 Merge branch 'release/v9.27' into develop 2019-02-20 20:55:05 +01:00
Sander Roosendaal
84548a2ae7 Merge branch 'release/v9.27' 2019-02-20 20:54:51 +01:00
Sander Roosendaal
916c097762 tested 2019-02-20 20:54:39 +01:00
Sander Roosendaal
8219dab1af tested 2019-02-20 20:49:00 +01:00
Sander Roosendaal
29cb93a322 team invite form 2019-02-20 20:39:21 +01:00
Sander Roosendaal
1052c61589 offercoaching form works 2019-02-20 20:15:44 +01:00
Sander Roosendaal
ee7a83a76b error fixes plus new coachoffer attribute 2019-02-20 20:10:39 +01:00
Sander Roosendaal
8f34de8ff0 notification emails
for rejected and accepted coaching offers and
requests
2019-02-20 13:11:33 +01:00
Sander Roosendaal
9e17862467 Merge branch 'release/v9.26' into develop 2019-02-19 21:27:36 +01:00
Sander Roosendaal
a68115fca6 Merge branch 'release/v9.26' 2019-02-19 21:25:44 +01:00