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 |
|
Sander Roosendaal
|
802258df00
|
added some model forms
|
2018-02-05 17:01:40 +01:00 |
|
Sander Roosendaal
|
a60bba671e
|
working on low level plannedsession
|
2018-02-05 13:49:59 +01:00 |
|
Sander Roosendaal
|
4c38b27ae6
|
Merge tag 'v5.75' into develop
bug fix
|
2018-02-05 10:10:51 +01:00 |
|
Sander Roosendaal
|
c704bf1988
|
Merge branch 'hotfix/v5.75'
|
2018-02-05 10:10:24 +01:00 |
|
Sander Roosendaal
|
b9e3e482e5
|
bug fix
|
2018-02-05 10:09:10 +01:00 |
|
Sander Roosendaal
|
92d69087cf
|
defined basic models and some low level functions
|
2018-01-26 11:03:00 +01:00 |
|
Sander Roosendaal
|
bb48cfb96b
|
model update
|
2018-01-25 17:36:40 +01:00 |
|
Sander Roosendaal
|
6abdacbc4e
|
link to plannedsession in workout model
|
2018-01-25 07:50:44 +01:00 |
|
Sander Roosendaal
|
66f1baf258
|
Merge tag 'v5.74' into develop
hotfix
|
2018-01-24 18:46:59 +01:00 |
|
Sander Roosendaal
|
e7890a4e54
|
Merge branch 'hotfix/v5.74'
|
2018-01-24 18:45:07 +01:00 |
|