Private
Public Access
1
0
Commit Graph

7727 Commits

Author SHA1 Message Date
Sander Roosendaal
46cbce7cb6 Merge branch 'release/v18.6.2' 2022-08-17 16:41:48 +02:00
Sander Roosendaal
af3d2f4056 fixing tests 2022-08-17 16:37:47 +02:00
Sander Roosendaal
2f73fc310c Merge branch 'feature/trainingpeaks' into develop 2022-08-17 06:47:50 +02:00
Sander Roosendaal
1fec766e60 removing print statement 2022-08-17 06:47:35 +02:00
Sander Roosendaal
b88aa0a246 using v3 now 2022-08-17 02:44:48 +02:00
Sander Roosendaal
a7773a6f4a v2/file now works 2022-08-17 02:09:22 +02:00
Sander Roosendaal
93e4c8fac8 Merge branch 'release/v18.6.1' 2022-08-10 10:37:53 +02:00
Sander Roosendaal
ef1722f963 fixing bug where new team member does not get cloned planned sessions 2022-08-10 09:46:46 +02:00
Sander Roosendaal
eab3a4c4ae Merge branch 'release/v18.6.0' 2022-07-21 17:18:49 +02:00
Sander Roosendaal
a3d0f00839 Merge branch 'feature/instroke' into develop 2022-07-21 14:12:53 +02:00
Sander Roosendaal
f7a5a41b7c polishing 2022-07-21 14:12:32 +02:00
Sander Roosendaal
5504d663c2 individual curves 2022-07-21 09:15:18 +02:00
Sander Roosendaal
3c888652de fixing active minutes 2022-07-21 08:44:28 +02:00
Sander Roosendaal
4646027ec6 including time range 2022-07-20 08:10:05 +02:00
Sander Roosendaal
973f863b92 adding time plot 2022-07-20 07:10:47 +02:00
Sander Roosendaal
4758be79c0 hiddenfields 2022-07-19 21:01:13 +02:00
Sander Roosendaal
673731af26 slider 2022-07-19 07:50:22 +02:00
Sander Roosendaal
8d077f6498 slider begin 2022-07-18 23:44:54 +02:00
Sander Roosendaal
93013eb1e2 ajax calls working 2022-07-18 21:12:24 +02:00
Sander Roosendaal
2bdecce604 Merge branch 'develop' into feature/instroke 2022-07-18 19:46:39 +02:00
Sander Roosendaal
451a1ff96f adding team member name to team workouts list 2022-07-18 19:46:02 +02:00
Sander Roosendaal
b557de73a2 instroke 2022-07-18 19:40:47 +02:00
Sander Roosendaal
d799de2cd2 Merge branch 'feature/tasks' into develop 2022-07-14 17:57:06 +02:00
Sander Roosendaal
34c77c684b merged dataprep and dataroutines 2022-07-14 17:56:32 +02:00
Sander Roosendaal
ecf9566f0b adding a few tests 2022-07-14 15:27:01 +02:00
Sander Roosendaal
868b39cd1f passing tests 2022-07-11 21:29:09 +02:00
Sander Roosendaal
3d62772ed2 using models in tasks.py 2022-07-11 20:30:05 +02:00
Sander Roosendaal
7f3d80dc4e removing dataprepnodjango 2022-07-11 19:21:46 +02:00
Sander Roosendaal
28d33c18f4 removing the obsolete 2022-07-08 18:05:33 +02:00
Sander Roosendaal
b8f7e76d97 attempt 1 2022-07-08 18:03:53 +02:00
Sander Roosendaal
6dba7ed59d Merge branch 'release/v18.5.22' 2022-07-08 14:48:40 +02:00
Sander Roosendaal
7a9e63b7e4 full name used in layout 2022-07-08 14:48:11 +02:00
Sander Roosendaal
194140f627 adding full_name 2022-07-08 14:46:04 +02:00
Sander Roosendaal
10e38c0dd0 Merge branch 'release/v18.5.21' 2022-07-08 14:08:45 +02:00
Sander Roosendaal
2dc66800bb small improvements 2022-07-08 14:08:26 +02:00
Sander Roosendaal
1d5a3cc1f4 Merge branch 'release/v18.5.20' 2022-07-07 07:59:20 +02:00
Sander Roosendaal
025ccf6df9 typo 2022-07-07 07:58:58 +02:00
Sander Roosendaal
3fba8e5e6f Merge branch 'release/v18.5.19' 2022-07-06 21:00:11 +02:00
Sander Roosendaal
52634aff73 added names 2022-07-06 20:59:58 +02:00
Sander Roosendaal
4d968743b4 handy links 2022-07-06 20:53:51 +02:00
Sander Roosendaal
1d543875ad Merge branch 'release/v18.5.18' 2022-07-05 22:38:08 +02:00
Sander Roosendaal
a0ce933a49 design 2022-07-05 22:37:49 +02:00
Sander Roosendaal
b37b32906f Merge branch 'release/v18.5.17' 2022-07-05 07:45:49 +02:00
Sander Roosendaal
273b9a9bb6 adding time team import 2022-07-05 07:16:21 +02:00
Sander Roosendaal
237bd98be3 Merge branch 'release/v18.5.16' 2022-07-04 07:41:11 +02:00
Sander Roosendaal
65f00b6ec3 Merge branch 'feature/boatmovers' into develop 2022-07-04 07:40:25 +02:00
Sander Roosendaal
331a3e2790 listtable 2022-07-03 16:59:07 +02:00
Sander Roosendaal
c0f409203c reset css 2022-07-03 16:42:55 +02:00
Sander Roosendaal
726e1a652f fixing race form 2022-06-29 21:45:23 +02:00
Sander Roosendaal
7fff546dbd fix 2022-06-29 21:43:08 +02:00