Private
Public Access
1
0
Commit Graph

3652 Commits

Author SHA1 Message Date
Sander Roosendaal
9d303c36dd blue side bar, top nav bar light blue, larger logo 2018-11-15 13:40:57 +01:00
Sander Roosendaal
9921e7d777 link to compare from planned session 2018-11-15 12:11:10 +01:00
Sander Roosendaal
1b414dbb30 Merge branch 'feature/othertypes' into develop 2018-11-14 22:27:42 +01:00
Sander Roosendaal
72fab9f5e2 fixing tests 2018-11-14 22:24:26 +01:00
Sander Roosendaal
398f083e81 weights in polar type 2018-11-14 22:04:23 +01:00
Sander Roosendaal
00539db335 progressing 2018-11-14 21:58:15 +01:00
Sander Roosendaal
1f0a5f5ec9 strava working 2018-11-14 20:52:53 +01:00
Sander Roosendaal
7d06649cae fix remote task error 2018-11-14 20:17:19 +01:00
Sander Roosendaal
f52de7e697 workouttype mapping for C2 2018-11-14 15:24:14 +01:00
Sander Roosendaal
fc5ee4517d jquery changes in forms with boat type 2018-11-14 14:59:16 +01:00
Sander Roosendaal
032a2e2067 Merge branch 'feature/duplicates' into develop 2018-11-14 11:27:22 +01:00
Sander Roosendaal
db2f31ff5b activity chart without duplicates 2018-11-14 10:56:42 +01:00
Sander Roosendaal
840e0b55f3 review duplicates upon delete workout 2018-11-14 10:26:40 +01:00
Sander Roosendaal
779a07c96b duplicates concept 2018-11-14 09:50:38 +01:00
Sander Roosendaal
0211bfc866 Merge branch 'feature/stravaauth' into develop 2018-11-14 08:48:35 +01:00
Sander Roosendaal
a524d65fe2 making tests run 2018-11-14 08:43:24 +01:00
Sander Roosendaal
dddc1e9224 typo 2018-11-13 16:34:24 +01:00
Sander Roosendaal
04e06051cf strava auth seems to work 2018-11-13 16:32:45 +01:00
Sander Roosendaal
f1d53db627 Merge tag 'v8.48' into develop
releasing plan improvements
2018-11-13 15:22:23 +01:00
Sander Roosendaal
c57b719a0c Merge branch 'release/v8.48' 2018-11-13 15:21:29 +01:00
Sander Roosendaal
b2516e2567 resolves #387 make coach view accessible
non coaches only see their own sessions
2018-11-13 14:49:45 +01:00
Sander Roosendaal
d195cbd618 Merge branch 'bugfix/powerstrava' into develop 2018-11-13 14:06:23 +01:00
Sander Roosendaal
ff331330f7 completing new colors 2018-11-13 14:02:42 +01:00
Sander Roosendaal
3fcd5abb01 fixing failing strava test 2018-11-13 12:46:16 +01:00
Sander Roosendaal
13a5841c13 Merge branch 'feature/stravaimport' into develop 2018-11-12 22:24:59 +01:00
Sander Roosendaal
5b81f51e41 importing power from Strava 2018-11-12 22:22:55 +01:00
Sander Roosendaal
7ba92cb8fd changing verdict names 2018-11-12 22:02:05 +01:00
Sander Roosendaal
4795e03579 new session verdicts and colors 2018-11-12 21:51:25 +01:00
Sander Roosendaal
94553a566b Merge tag 'v8.47' into develop
bug fix
2018-11-12 20:51:35 +01:00
Sander Roosendaal
0381c57207 Merge branch 'hotfix/v8.47' 2018-11-12 20:51:09 +01:00
Sander Roosendaal
1509bc7ade fixed initials 2018-11-12 20:49:23 +01:00
Sander Roosendaal
4dcc3f8a8a Merge tag 'v8.46' into develop
releasing some plan improvements
2018-11-12 20:05:24 +01:00
Sander Roosendaal
f85d5f71c1 Merge branch 'release/v8.46' 2018-11-12 20:04:30 +01:00
Sander Roosendaal
fd940ba705 style fiddling 2018-11-12 20:02:07 +01:00
Sander Roosendaal
8e9a8d8957 ics is now download file 2018-11-12 19:51:18 +01:00
Sander Roosendaal
25f543f969 print media 2018-11-12 17:45:18 +01:00
Sander Roosendaal
c7a335c33f some print media css 2018-11-12 17:41:24 +01:00
Sander Roosendaal
f62460eeba implemented ics export by email 2018-11-12 16:40:05 +01:00
Sander Roosendaal
f660a2650b Merge branch 'feature/plan' into develop 2018-11-12 14:08:55 +01:00
Sander Roosendaal
1b1a8c63f7 improvements in plan functionality 2018-11-12 14:07:08 +01:00
Sander Roosendaal
15555402d2 adding unfold/fold all checkbox in trainingplan view 2018-11-12 12:08:56 +01:00
Sander Roosendaal
dae9c80f6f adding athlete selector for coaches when creating target/plan 2018-11-12 11:50:52 +01:00
Sander Roosendaal
7a39e42575 Merge tag 'v8.45' into develop
bug fixes
2018-11-12 10:49:56 +01:00
Sander Roosendaal
01eb8ffd48 Merge branch 'hotfix/v8.45' 2018-11-12 10:49:33 +01:00
Sander Roosendaal
3e2860062c adding / to print url 2018-11-12 10:47:36 +01:00
Sander Roosendaal
afce33f805 fix legenda placement multiflex 2018-11-12 10:23:27 +01:00
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
8004ad7f33 Merge tag 'v8.44' into develop
bug fix
2018-11-09 18:03:56 +01:00
Sander Roosendaal
a6222054f8 Merge branch 'release/v8.44' 2018-11-09 18:03:05 +01:00