Private
Public Access
1
0
Commit Graph

2375 Commits

Author SHA1 Message Date
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
Sander Roosendaal
91d59dfc28 attach workouts to sessions version 0 2018-02-07 16:37:03 +01:00
Sander Roosendaal
d3448c66f1 Date range selection on session view 2018-02-06 21:00:59 +01:00
Sander Roosendaal
7bb91c33c7 added date ranges to sessionview 2018-02-06 20:14:46 +01:00
Sander Roosendaal
7e73a5c06b updated basic plannedsession view 2018-02-06 11:28:46 +01:00
Sander Roosendaal
da02466f8a very basic plannedsession view view 2018-02-06 10:57:47 +01:00
Sander Roosendaal
c33d6cb5e5 Merge branch 'develop' into feature/planning 2018-02-06 08:24:20 +01:00
Sander Roosendaal
f47130c071 Merge tag 'v5.77' into develop
replacing gifs
2018-02-06 08:23:58 +01:00
Sander Roosendaal
0490278fbf Merge branch 'hotfix/v5.77' 2018-02-06 08:21:56 +01:00
Sander Roosendaal
8045931b75 updated rowingtimer.gif 2018-02-06 08:20:55 +01:00
Sander Roosendaal
1fe1d08aa9 replaced all with rowing timers 2018-02-06 08:20:19 +01:00
Sander Roosendaal
51d8f3c9e1 adding session edit 2018-02-05 22:02:25 +01:00
Sander Roosendaal
ba334554eb create plannedsession view v1.0 2018-02-05 21:36:11 +01:00
Sander Roosendaal
cdf18058b9 first version of session create page 2018-02-05 20:43:54 +01:00
Sander Roosendaal
7a51a51df4 Merge branch 'develop' into feature/planning 2018-02-05 20:08:12 +01:00
Sander Roosendaal
c30ec4b570 add plan to member plans 2018-02-05 20:07:35 +01:00
Sander Roosendaal
e7f053b9de Merge tag 'v5.76' into develop
unfinished
2018-02-05 19:38:30 +01:00
Sander Roosendaal
77693ddf9e Merge branch 'hotfix/v5.76' 2018-02-05 19:35:05 +01:00
Sander Roosendaal
ad07cdbe7e initial replacement of gif 2018-02-05 19:32:05 +01:00