Sander Roosendaal
|
441d5bd39f
|
Merge branch 'release/v6.17'
|
2018-03-11 19:20:00 +01:00 |
|
Sander Roosendaal
|
de4ec80f64
|
bug fixed on clone session
was comparing datetime.datetime to datetime.date
|
2018-03-11 19:03:47 +01:00 |
|
Sander Roosendaal
|
26254c87ac
|
link bug fix
|
2018-03-11 11:43:51 +01:00 |
|
Sander Roosendaal
|
06633f1a89
|
linebreaks in workflow workout notes
|
2018-03-11 11:30:03 +01:00 |
|
Sander Roosendaal
|
4e39a7d598
|
Merge tag 'v6.16' into develop
small improvements for coaches
|
2018-03-11 11:17:47 +01:00 |
|
Sander Roosendaal
|
5f118f9438
|
Merge branch 'release/v6.16'
|
2018-03-11 11:05:45 +01:00 |
|
Sander Roosendaal
|
a94912e124
|
wrapping text in some tables
|
2018-03-11 10:54:57 +01:00 |
|
Sander Roosendaal
|
843a94c579
|
Merge tag 'v6.15' into develop
form processing for preferreddate
|
2018-03-10 17:04:44 +01:00 |
|
Sander Roosendaal
|
e40ae0a6a6
|
Merge branch 'release/v6.15'
|
2018-03-10 16:48:50 +01:00 |
|
Sander Roosendaal
|
4c1a2a7450
|
added form processing for preferreddate
|
2018-03-10 16:27:48 +01:00 |
|
Sander Roosendaal
|
be6d343b21
|
Merge tag 'v6.14' into develop
improved session order
|
2018-03-10 15:55:06 +01:00 |
|
Sander Roosendaal
|
c6562f2e81
|
Merge branch 'release/v6.14'
|
2018-03-10 15:54:08 +01:00 |
|
Sander Roosendaal
|
9af1ebc9db
|
adding preffereddate to session and tooltip on workout
|
2018-03-10 15:48:23 +01:00 |
|
Sander Roosendaal
|
22bc518bf2
|
Merge tag 'v6.13' into develop
updated gdpr
|
2018-03-09 13:20:20 +01:00 |
|
Sander Roosendaal
|
028990689f
|
Merge branch 'release/v6.13'
|
2018-03-09 13:19:44 +01:00 |
|
Sander Roosendaal
|
ac82aa8ddd
|
link to dummy workout xls template
|
2018-03-09 12:58:41 +01:00 |
|
Sander Roosendaal
|
656104a921
|
more detailed privacy policy around teams and bug fix
|
2018-03-09 09:01:00 +01:00 |
|
Sander Roosendaal
|
c3a50e1c3d
|
Merge branch 'feature/gdpr' into develop
|
2018-03-09 07:54:39 +01:00 |
|
Sander Roosendaal
|
150171200b
|
bugfix split workout
|
2018-03-08 13:16:46 +01:00 |
|
Sander Roosendaal
|
5d3e58c1fc
|
revised privacy policy
|
2018-03-08 12:52:38 +01:00 |
|
Sander Roosendaal
|
ba1893c6bc
|
Merge tag 'v6.12' into develop
bug fix flex charts
|
2018-03-08 10:11:23 +01:00 |
|
Sander Roosendaal
|
582055f23e
|
Merge branch 'release/v6.12'
|
2018-03-08 10:09:34 +01:00 |
|
Sander Roosendaal
|
1cb9816136
|
additional data check empty in flex chart
|
2018-03-08 08:53:49 +01:00 |
|
Sander Roosendaal
|
0b640efd93
|
Merge tag 'v6.11' into develop
bug fix
|
2018-03-08 08:39:56 +01:00 |
|
Sander Roosendaal
|
9e7eb45d2c
|
Merge branch 'release/v6.11'
|
2018-03-08 08:39:40 +01:00 |
|
Sander Roosendaal
|
b4074f50ce
|
added user names to workouts to help coaches
|
2018-03-08 08:38:44 +01:00 |
|
Sander Roosendaal
|
dd77159c8d
|
fixed thumbnails
|
2018-03-08 08:15:18 +01:00 |
|
Sander Roosendaal
|
616477f077
|
de-activated GDPR middleware
|
2018-03-08 08:11:33 +01:00 |
|
Sander Roosendaal
|
ef632e67d3
|
Merge tag 'v6.1' into develop
release of GDPR stuff
|
2018-03-07 22:13:15 +01:00 |
|
Sander Roosendaal
|
066455dccc
|
Merge branch 'release/v6.1'
|
2018-03-07 22:12:34 +01:00 |
|
Sander Roosendaal
|
f664bb6c8e
|
Merge branch 'feature/gdpr' into develop
|
2018-03-07 22:08:16 +01:00 |
|
Sander Roosendaal
|
100cd9a48f
|
updated legal text on legal page and GDPR opt in page
|
2018-03-07 22:06:27 +01:00 |
|
Sander Roosendaal
|
1a87d72a8d
|
removing google analytics and clicky
|
2018-03-07 15:59:42 +01:00 |
|
Sander Roosendaal
|
ad71e8ff0d
|
implemented positive opt in for GDPR
|
2018-03-07 13:55:25 +01:00 |
|
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 |
|