Private
Public Access
1
0
Commit Graph

2490 Commits

Author SHA1 Message Date
Sander Roosendaal
0808884c9c formset 2018-03-06 21:40:28 +01:00
Sander Roosendaal
6b5a76242d fixed time weighted mean bug
Please enter the commit message for your changes. Lines starting
2018-03-06 20:34:48 +01:00
Sander Roosendaal
d80e7d8f04 gdpr user delete and user deactivate functions 2018-03-06 20:20:42 +01:00
Sander Roosendaal
e353b1cf1f typo 2018-03-06 13:14:41 +01:00
Sander Roosendaal
4219725471 removed some print statements 2018-03-06 13:12:47 +01:00
Sander Roosendaal
f9b7b00028 Merge tag 'v6.00' into develop
hotfix typo in models.py
2018-03-05 15:20:22 +01:00
Sander Roosendaal
38d4eeb7a3 Merge branch 'hotfix/v6.00' 2018-03-05 15:19:51 +01:00
Sander Roosendaal
0fd4393c06 typo fix 2018-03-05 15:19:12 +01:00
Sander Roosendaal
ea78242949 added data download button on user settings 2018-03-05 12:51:07 +01:00
Sander Roosendaal
c1ad98e885 Merge branch 'feature/coachsettings' into develop 2018-03-04 17:30:45 +01:00
Sander Roosendaal
18b58aa780 add link to user edit on Team page 2018-03-04 16:26:43 +01:00
Sander Roosendaal
e517767641 team manager can edit user 2018-03-04 16:18:58 +01:00
Sander Roosendaal
fd99872160 Merge tag 'v5.99' into develop
added print view
2018-03-04 09:11:43 +01:00
Sander Roosendaal
9a183dd63f Merge branch 'release/v5.99' 2018-03-04 09:11:17 +01:00
Sander Roosendaal
dcb7884f45 added plan print view 2018-03-03 20:57:08 +01:00
Sander Roosendaal
048b4e9e34 bug fix next week 2018-03-03 17:48:46 +01:00
Sander Roosendaal
39a21bf45f added comment to session view 2018-03-03 16:56:54 +01:00
Sander Roosendaal
6ca5ec83cc Merge tag 'upgradetopro' into develop
bug fix
2018-03-03 12:59:41 +01:00
Sander Roosendaal
cafa92e6bc Merge branch 'hotfix/upgradetopro' 2018-03-03 12:58:44 +01:00
Sander Roosendaal
061d94d7b5 removed Upgrade to Pro button for Plan users 2018-03-03 12:57:38 +01:00
Sander Roosendaal
b642c140f5 changed criterium (a bike race) to criteria 2018-03-03 11:20:33 +01:00
Sander Roosendaal
0108cb3079 Merge tag 'v5.98' into develop
releasing plan v1.0
2018-03-03 10:44:42 +01:00
Sander Roosendaal
c3fd328b5f Merge branch 'release/v5.98' 2018-03-03 10:38:31 +01:00
Sander Roosendaal
855f2ff739 updated buttons and text on plans
Pro membership, Plan membership & about page
2018-03-03 10:36:35 +01:00
Sander Roosendaal
66452b44c0 bug fix and additional filtering for spm<0 2018-03-02 10:37:24 +01:00
Sander Roosendaal
8e0de9163f ranking pieces in reverse chronological order on CP view 2018-02-27 16:15:00 +01:00
Sander Roosendaal
5709669dc5 added name to CP chart 2018-02-27 15:48:23 +01:00
Sander Roosendaal
c41ebc2c2f Merge branch 'feature/cpchart' into develop 2018-02-27 14:32:24 +01:00
Sander Roosendaal
0dba22873a filtering out PM3 power during rest 2018-02-27 14:31:18 +01:00
Sander Roosendaal
d7f238a6e3 added some filtering 2018-02-27 14:24:57 +01:00
Sander Roosendaal
c1158747e3 typo fix on multiclone_select 2018-02-26 20:21:58 +01:00
Sander Roosendaal
142391f90a replaced ix with iloc 2018-02-26 16:55:28 +01:00
Sander Roosendaal
f1b035e290 Merge tag 'v5.97' into develop
weighted averages & bug fix
2018-02-25 09:21:42 +01:00
Sander Roosendaal
5964da7f7e Merge branch 'release/v5.97' 2018-02-25 09:21:01 +01:00
Sander Roosendaal
38aedc02ca bug fix 2018-02-25 09:18:13 +01:00
Sander Roosendaal
57eee137ce added weighted average - rScore now uses weighted average 2018-02-24 14:23:48 +01:00
Sander Roosendaal
f4a66a78cf Merge tag 'v5.96' into develop
UI improvements sessions forms
2018-02-23 13:41:15 +01:00
Sander Roosendaal
0eb7efd4aa Merge branch 'release/v5.96' 2018-02-23 13:38:38 +01:00
Sander Roosendaal
4fb4b565ca Merge branch 'feature/plans' into develop 2018-02-23 13:27:50 +01:00
Sander Roosendaal
5c55b4977c persmission on team members session 2018-02-23 13:26:44 +01:00
Sander Roosendaal
353b93dc22 Updated membership related info and paypal buttons 2018-02-23 13:13:03 +01:00
Sander Roosendaal
f08ec40a8a some UI improvements on planned sessions 2018-02-23 11:06:58 +01:00
Sander Roosendaal
9e461810c3 Merge tag 'v5.95' into develop
test courses
2018-02-22 21:48:10 +01:00
Sander Roosendaal
941bf89c52 Merge branch 'release/v5.95' 2018-02-22 21:46:44 +01:00
Sander Roosendaal
b419382760 Merge branch 'feature/courses' into develop 2018-02-22 21:41:08 +01:00
Sander Roosendaal
581250a7b0 v0.1 of testcourse working (plannedsession) 2018-02-22 21:39:15 +01:00
Sander Roosendaal
083f91914c work in progress - need to convert course time to datetime 2018-02-22 17:46:17 +01:00
Sander Roosendaal
d09f35f785 Merge tag 'v5.94' into develop
bug fix reverse country lookup
2018-02-21 21:26:25 +01:00
Sander Roosendaal
d56d05091e Merge branch 'release/v5.94' 2018-02-21 21:25:17 +01:00
Sander Roosendaal
077ce07b7b Merge branch 'feature/courses' into develop 2018-02-21 21:22:34 +01:00