Private
Public Access
1
0
Commit Graph

2393 Commits

Author SHA1 Message Date
Sander Roosendaal
76cadea8b6 some fine tuning of plannedsession UI 2018-02-14 11:27:17 +01:00
Sander Roosendaal
55513c8470 Merge tag 'v5.85' into develop
multicreate
2018-02-13 22:00:35 +01:00
Sander Roosendaal
574f77aa6a Merge branch 'release/v5.85' 2018-02-13 22:00:09 +01:00
Sander Roosendaal
c4b727f4e4 Merge branch 'feature/multiplanningform' into develop 2018-02-13 21:57:59 +01:00
Sander Roosendaal
57b70c586b Merge tag 'v5.84' into develop
multicreate
2018-02-13 21:54:10 +01:00
Sander Roosendaal
c799cd261c Merge branch 'release/v5.84' 2018-02-13 21:53:42 +01:00
Sander Roosendaal
1030b3f126 bulk edit links 2018-02-13 21:50:25 +01:00
Sander Roosendaal
4b5b33b1f5 small improvement 2018-02-13 21:45:52 +01:00
Sander Roosendaal
0a47d0b840 somehow working 2018-02-13 20:13:18 +01:00
Sander Roosendaal
7d4a2f2251 initial multicreate plannedsesssion not working 2018-02-13 16:03:58 +01:00
Sander Roosendaal
41c38354bc Merge tag 'v5.83' into develop
age verification, plannedsession form improvements,

fix bug in TSS calculation
2018-02-13 13:55:28 +01:00
Sander Roosendaal
d43134be35 Merge branch 'release/v5.83' 2018-02-13 13:54:32 +01:00
Sander Roosendaal
fd9388402a added age verification and improvements on plannedsession 2018-02-13 13:40:08 +01:00
Sander Roosendaal
5f287b9ccd Merge branch 'bugfix/rscore' into develop 2018-02-13 08:31:18 +01:00
Sander Roosendaal
a874609bb5 date is sticky in plannedsession create form 2018-02-13 08:29:50 +01:00
Sander Roosendaal
ae0e0650e8 TSS calculation now always includes rest strokes 2018-02-13 08:18:17 +01:00
Sander Roosendaal
3a30c7dafc Merge branch 'feature/planningimprovements' into develop 2018-02-12 17:36:19 +01:00
Sander Roosendaal
9b8d2229a2 minor improvements plannedsession views 2018-02-12 17:35:14 +01:00
Sander Roosendaal
cd96820985 bug fixes 2018-02-12 08:22:33 +01:00
Sander Roosendaal
1a5d89fcbb Merge tag 'v5.82' into develop
coach view (planning)
2018-02-11 20:11:32 +01:00
Sander Roosendaal
3afa92c278 Merge branch 'release/v5.82' 2018-02-11 20:10:58 +01:00
Sander Roosendaal
d833b9c1c9 Merge branch 'feature/planning3' into develop 2018-02-11 20:03:23 +01:00
Sander Roosendaal
c185d680c6 navigation for coach view 2018-02-11 14:23:33 +01:00
Sander Roosendaal
8884e2f7b1 session coach view v1 2018-02-11 13:55:51 +01:00
Sander Roosendaal
fdc4ec15ea added other rowers result to session view 2018-02-10 17:16:10 +01:00
Sander Roosendaal
ba8fc0f035 bug fix 2018-02-10 16:37:14 +01:00
Sander Roosendaal
f3b4f64223 Merge tag 'v5.81' into develop
fixed permission bug in session view
2018-02-10 09:48:56 +01:00
Sander Roosendaal
7155ceb945 Merge branch 'hotfix/v5.81' 2018-02-10 09:45:17 +01:00
Sander Roosendaal
3a5ddf3d1a fixed wrong permission setting 2018-02-10 09:44:09 +01:00
Sander Roosendaal
ee4b7455e5 Merge tag 'v5.80' into develop
trial period and team session edit
2018-02-09 16:53:09 +01:00
Sander Roosendaal
e9d457ce85 Merge branch 'release/v5.80' 2018-02-09 16:52:49 +01:00
Sander Roosendaal
0fd217bae7 Merge branch 'feature/planningcoach2' into develop 2018-02-09 16:44:13 +01:00
Sander Roosendaal
cd134a40fd edit and create team sessions 2018-02-09 16:40:47 +01:00
Sander Roosendaal
c22740002c Merge branch 'develop' into feature/planningcoach2 2018-02-09 10:35:06 +01:00
Sander Roosendaal
71ad6a0dee implemented Pro trial period 2018-02-09 10:26:54 +01:00
Sander Roosendaal
a32eb96567 add rower select to session edit 2018-02-08 23:15:54 +01:00
Sander Roosendaal
6ff73c44c4 improved date behavior for cloning 2018-02-08 23:11:26 +01:00
Sander Roosendaal
9df9969939 Merge tag 'v5.79' into develop
minor improvements
2018-02-08 22:55:20 +01:00
Sander Roosendaal
ecb7ac9ea5 Merge branch 'release/v5.79' 2018-02-08 22:54:17 +01:00
Sander Roosendaal
ce99837957 Merge branch 'feature/coachplanning' into develop 2018-02-08 22:52:47 +01:00
Sander Roosendaal
f149e2b431 minor improvements 2018-02-08 22:47:35 +01:00
Sander Roosendaal
2457a0d968 minor improvements 2018-02-08 20:50:37 +01:00
Sander Roosendaal
d9d6c3d6d3 Merge tag 'v5.78' into develop
first release of planning functionality
2018-02-08 15:40:43 +01:00
Sander Roosendaal
362d0857ad Merge branch 'release/v5.78' 2018-02-08 15:40:19 +01:00
Sander Roosendaal
c99196d02a Merge branch 'feature/planning' into develop 2018-02-08 15:32:33 +01:00
Sander Roosendaal
42426cdda2 fine tuning 2018-02-08 15:31:23 +01:00
Sander Roosendaal
7d51bb9356 import cross training allowed 2018-02-08 11:29:07 +01:00
Sander Roosendaal
d785404815 link to session number on plan overview 2018-02-07 22:46:28 +01:00
Sander Roosendaal
6a56bb98b6 some javascript to improve planned session manage 2018-02-07 22:30:47 +01:00
Sander Roosendaal
1e70708ce0 save 2018-02-07 16:50:34 +01:00