Private
Public Access
1
0
Commit Graph

3562 Commits

Author SHA1 Message Date
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
Sander Roosendaal
e30390f989 Merge tag 'v8.33' into develop
sharing plans and targets
2018-10-29 21:25:13 +01:00
Sander Roosendaal
1811e45d7f Merge branch 'release/v8.33' 2018-10-29 21:24:42 +01:00
Sander Roosendaal
329b560527 Merge branch 'feature/shareplans' into develop 2018-10-29 21:21:40 +01:00
Sander Roosendaal
0e650fe0df template details 2018-10-29 20:37:45 +01:00
Sander Roosendaal
8369eb1042 multiple athletes for plans and targets 2018-10-29 20:29:20 +01:00
Sander Roosendaal
ada4cdb225 first cut 2018-10-29 16:33:55 +01:00
Sander Roosendaal
30c0ea6946 Merge tag 'v8.32' into develop
time period switching improvements in plan
2018-10-29 14:57:42 +01:00
Sander Roosendaal
12fc0ae06f Merge branch 'release/v8.32' 2018-10-29 14:57:14 +01:00
Sander Roosendaal
5884304e92 Merge branch 'feature/replan' into develop 2018-10-29 14:39:32 +01:00
Sander Roosendaal
8aab3fa65d adding some breadcrumbs here & there 2018-10-29 14:22:00 +01:00
Sander Roosendaal
d201fc90de better time switching 2018-10-29 14:03:27 +01:00
Sander Roosendaal
0d8cab48be Merge tag 'v8.31' into develop
bug fixes in training replan
2018-10-29 11:12:04 +01:00
Sander Roosendaal
54ffadf20d Merge branch 'release/v8.31' 2018-10-29 11:11:37 +01:00
Sander Roosendaal
0a469e81fe better protection of private workouts 2018-10-29 11:08:49 +01:00
Sander Roosendaal
a10cba74f6 bug fix 2018-10-29 10:26:25 +01:00
Sander Roosendaal
54648c63b5 improved sunday algorithm 2018-10-29 09:36:23 +01:00
Sander Roosendaal
a99507a90f time period select on planned sessions view 2018-10-28 20:57:34 +01:00
Sander Roosendaal
7634bcaca9 Merge tag 'v8.30' into develop
bug fix
2018-10-28 20:03:49 +01:00
Sander Roosendaal
5541457637 Merge branch 'hotfix/v8.30' 2018-10-28 20:03:25 +01:00
Sander Roosendaal
c5dbc01f8d hot fix 2018-10-28 20:02:02 +01:00
Sander Roosendaal
eeee5fcd3b Merge tag 'v8.29' into develop
bug fix
2018-10-28 18:12:34 +01:00
Sander Roosendaal
d1d119da37 Merge branch 'hotfix/v8.29' 2018-10-28 18:10:22 +01:00
Sander Roosendaal
3612a33989 bug fix compare 2018-10-28 18:09:08 +01:00
Sander Roosendaal
14efd12ff7 Merge tag 'v8.28' into develop
fix compare
2018-10-28 17:49:59 +01:00
Sander Roosendaal
b2cf19f0d3 Merge branch 'hotfix/v8.28' 2018-10-28 17:49:24 +01:00
Sander Roosendaal
8a42590d85 bug fix 2018-10-28 17:47:49 +01:00
Sander Roosendaal
9415f71580 Merge tag 'v8.27' into develop
release
2018-10-28 16:55:37 +01:00
Sander Roosendaal
3a3b17d47e Merge branch 'release/v8.27' 2018-10-28 16:47:20 +01:00
Sander Roosendaal
39fcdc4fe5 bug fix 2018-10-28 16:45:58 +01:00
Sander Roosendaal
aca1f569b1 Merge branch 'feature/autocycles' into develop 2018-10-27 17:12:07 +02:00
Sander Roosendaal
f36cef9f71 menu unfolding on trainingplan 2018-10-27 17:10:52 +02:00
Sander Roosendaal
a523d21ecf small change 2018-10-26 15:10:59 +02:00
Sander Roosendaal
0a9b448e04 added plan macro by months 2018-10-26 15:06:30 +02:00
Sander Roosendaal
8617156db5 replan meso cycle by weeks 2018-10-26 13:47:29 +02:00
Sander Roosendaal
96ff340bb3 distinguishing between plan manager and plan athlete 2018-10-26 12:33:57 +02:00
Sander Roosendaal
9c09c4538f Merge branch 'feature/sources' into develop 2018-10-26 09:43:43 +02:00
Sander Roosendaal
c8bcf55cd5 adding workoutsource where forgotten 2018-10-26 09:34:13 +02:00
Sander Roosendaal
d85a1a7045 favorite charts by workout source 2018-10-26 09:17:19 +02:00
Sander Roosendaal
4e0db6e2e0 replaced i with em in sessions table 2018-10-26 08:10:01 +02:00
Sander Roosendaal
20e4b6fde4 Merge branch 'feature/comparison' into develop 2018-10-25 15:17:58 +02:00
Sander Roosendaal
929144cc56 added new url to tests.py 2018-10-25 15:16:26 +02:00
Sander Roosendaal
3739cdbda9 comparison with preselected workout 2018-10-25 15:08:44 +02:00
Sander Roosendaal
7b50ff5196 Merge tag 'v8.26' into develop
bug fix
2018-10-25 13:28:50 +02:00