Private
Public Access
1
0
Commit Graph

3605 Commits

Author SHA1 Message Date
Sander Roosendaal
dce7785b58 multiflex UI and bux fix 2018-11-12 09:59:55 +01:00
Sander Roosendaal
04a988430b reducing queryset should be using exclude 2018-11-12 09:08:56 +01:00
Sander Roosendaal
a6222054f8 Merge branch 'release/v8.44' 2018-11-09 18:03:05 +01:00
Sander Roosendaal
8652c8e794 bug fix redirect after multi clone 2018-11-09 17:39:53 +01:00
Sander Roosendaal
835ffc98d0 Merge tag 'v8.43' into develop
changes in date range selector for plan
2018-11-09 14:52:47 +01:00
Sander Roosendaal
3f8aa406c2 Merge branch 'release/v8.43' 2018-11-09 14:52:19 +01:00
Sander Roosendaal
b347b97591 Merge branch 'feature/planningnav' into develop 2018-11-09 14:09:37 +01:00
Sander Roosendaal
2f705d0aea all plan pages now have date range form 2018-11-09 14:07:18 +01:00
Sander Roosendaal
4955ee8692 date selector works on plannedsessions 2018-11-09 12:57:38 +01:00
Sander Roosendaal
a376c079c7 improved manual entry form 2018-11-09 12:10:56 +01:00
Sander Roosendaal
a562fc3f64 addmanual added to menu 2018-11-09 09:09:32 +01:00
Sander Roosendaal
4301293665 Merge tag 'v8.42' into develop
multi clone bug fixes & improvements
2018-11-07 22:06:19 +01:00
Sander Roosendaal
11709ee9b9 Merge branch 'release/v8.42' 2018-11-07 22:05:56 +01:00
Sander Roosendaal
fcdcd09fd3 adding info message after pace smoothening 2018-11-07 21:52:58 +01:00
Sander Roosendaal
d5f80c5c24 Merge branch 'bugfix/multiclone' into develop 2018-11-07 21:43:11 +01:00
Sander Roosendaal
a7b1e19fa8 fixed bug in formset loading session multicreate 2018-11-07 21:41:37 +01:00
Sander Roosendaal
fa66ec76d0 redirect after multi clone improvement 2018-11-07 21:09:22 +01:00
Sander Roosendaal
83fd09d4e9 Merge tag 'v8.41' into develop
bug fix
2018-11-06 18:47:19 +01:00
Sander Roosendaal
4c5a312c18 Merge branch 'release/v8.41' 2018-11-06 18:46:48 +01:00
Sander Roosendaal
88d65b2819 bug fix for blogs without featured image 2018-11-06 17:22:29 +01:00
Sander Roosendaal
9f6c7357e0 some improvements in team sessions 2018-11-05 07:34:12 +01:00
Sander Roosendaal
6718579187 Merge tag 'v8.40' into develop
hot fix
2018-11-03 06:50:04 +01:00
Sander Roosendaal
3e4890d8a7 Merge branch 'hotfix/v8.40' 2018-11-03 06:49:31 +01:00
Sander Roosendaal
c759ff2ae8 hot fix training plan creation form 2018-11-03 06:48:07 +01:00
Sander Roosendaal
c1430522eb Merge tag 'v8.39' into develop
bug fix pro trial
2018-11-02 19:23:10 +01:00
Sander Roosendaal
1060407097 Merge branch 'release/v8.39' 2018-11-02 19:20:17 +01:00
Sander Roosendaal
5c7543bf5e small change in confirmation email 2018-11-02 19:01:59 +01:00
Sander Roosendaal
e0ec5d62dd trial bug fixed 2018-11-02 18:48:43 +01:00
Sander Roosendaal
49ca7e3797 Merge tag 'v8.38' into develop
fixes rscore bug & broken compare link
2018-11-01 20:19:28 +01:00
Sander Roosendaal
c75b0a41b1 Merge branch 'release/v8.38' 2018-11-01 20:17:45 +01:00
Sander Roosendaal
40941bc6d6 removing some debugging code 2018-11-01 19:44:02 +01:00
Sander Roosendaal
8903040d11 refined rScore 2018-11-01 19:43:04 +01:00
Sander Roosendaal
fdf399dd4c fixed a bug in rScore calculation 2018-11-01 17:52:43 +01:00
Sander Roosendaal
d0e0e577f9 Merge branch 'feature/uximprovements' into develop 2018-10-31 13:37:34 +01:00
Sander Roosendaal
eb773bb7e1 adding cycle notes to training plan 2018-10-31 13:20:09 +01:00
Sander Roosendaal
b4255c4e2a target unicode representation and target selection 2018-10-31 11:49:23 +01:00
Sander Roosendaal
3d06bf5ad1 in side menu show only plans that are in today's range 2018-10-31 10:33:47 +01:00
Sander Roosendaal
ae41061d8c Merge tag 'v8.37' into develop
bug fix
2018-10-31 07:54:25 +01:00
Sander Roosendaal
085ac1a936 Merge branch 'hotfix/v8.37' 2018-10-31 07:50:26 +01:00
Sander Roosendaal
5d56f66729 user-tie replaced with user-chart for Self Coach 2018-10-30 17:38:23 +01:00
Sander Roosendaal
891aabb8c7 Merge tag 'v8.36' into develop
bug fix
2018-10-30 13:58:15 +01:00
Sander Roosendaal
1f4422a7ba Merge branch 'release/v8.36' 2018-10-30 13:57:07 +01:00
Sander Roosendaal
95d6ab4d29 removing rower from trainingplan/trainingtarget 2018-10-30 13:20:06 +01:00
Sander Roosendaal
2b02fcc1ec Merge tag 'v8.35' into develop
hotfix
2018-10-30 10:58:26 +01:00
Sander Roosendaal
14a380cef2 Merge branch 'hotfix/v8.35' 2018-10-30 10:57:40 +01:00
Sander Roosendaal
097d6a7f3d hot fix session view 2018-10-30 10:54:54 +01:00
Sander Roosendaal
8d66d5a987 Merge tag 'v8.34' into develop
improvements on plan
2018-10-29 21:58:58 +01:00
Sander Roosendaal
c81f11864d Merge branch 'hotfix/v8.34' 2018-10-29 21:57:58 +01:00
Sander Roosendaal
840b6c6eab showing actuals only for active plans 2018-10-29 21:55:36 +01:00
Sander Roosendaal
bdf86d7321 edit plan 2018-10-29 21:47:58 +01:00