Private
Public Access
1
0
Commit Graph

4926 Commits

Author SHA1 Message Date
Sander Roosendaal
4ccdbeff58 Merge branch 'release/v10.40' 2019-10-24 09:03:58 +02:00
Sander Roosendaal
effb8cc7a7 Merge branch 'feature/dask' into develop 2019-10-24 08:17:25 +02:00
Sander Roosendaal
ff5a8a7d3e restored strokedata temporarily 2019-10-24 08:16:28 +02:00
Sander Roosendaal
2099dde846 bug fixes 2019-10-23 21:25:47 +02:00
Sander Roosendaal
8398701320 moving age group records to c2stuff 2019-10-23 20:34:16 +02:00
Sander Roosendaal
7a26669cd7 removed StrokeData table and all references to it 2019-10-23 20:17:49 +02:00
Sander Roosendaal
c0e8e448e3 updated dataprepnodjango 2019-10-23 20:04:28 +02:00
Sander Roosendaal
fa373d781f ds 2019-10-23 18:15:07 +02:00
Sander Roosendaal
4ea24fa5aa small improvements dataprep 2019-10-23 06:48:58 +02:00
Sander Roosendaal
8e2f7b0cce updates in nodjango 2019-10-22 22:02:45 +02:00
Sander Roosendaal
450a32221f removed temp file 2019-10-22 21:58:39 +02:00
Sander Roosendaal
08c135c6cd testing 2019-10-22 21:58:09 +02:00
Sander Roosendaal
622ae44ea6 using dask 2019-10-22 21:40:35 +02:00
Sander Roosendaal
7f2c68a903 bla 2019-10-22 21:34:03 +02:00
Sander Roosendaal
6de6a0dae1 ordering in mysql 2019-10-22 14:33:36 +02:00
Sander Roosendaal
964416362d bug fix in stroke force chart 2019-10-22 08:37:09 +02:00
Sander Roosendaal
c45e6a1a93 Merge branch 'release/v10.39' 2019-10-20 13:43:42 +02:00
Sander Roosendaal
ec75ba1c16 making execution chart accessible 2019-10-20 13:35:03 +02:00
Sander Roosendaal
8f2e0356d1 bug fix 2019-10-19 15:33:04 +02:00
Sander Roosendaal
df0e413658 Merge branch 'release/v10.38' 2019-10-17 22:12:09 +02:00
Sander Roosendaal
45666d22a7 adding command to store blog posts locally 2019-10-17 22:09:01 +02:00
Sander Roosendaal
ed02c7c52b Merge tag 'v10.37' into develop
releasing faster blog calls
2019-10-17 16:18:28 +02:00
Sander Roosendaal
4ca5cb5f93 Merge branch 'release/v10.37' 2019-10-17 16:17:59 +02:00
Sander Roosendaal
a04f1fe3e7 speeding up blog posts call 2019-10-17 16:01:49 +02:00
Sander Roosendaal
57d6db6b98 Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-10-17 15:56:05 +02:00
Sander Roosendaal
b4a56f32ac limiting blog post call to 3 2019-10-17 15:54:28 +02:00
Sander Roosendaal
61b07f3009 Merge branch 'feature/minify' into develop 2019-10-13 09:10:51 +02:00
Sander Roosendaal
f440fce311 style 2019-10-13 09:10:42 +02:00
Sander Roosendaal
5df3b77f16 using minified versions of styles 2019-10-13 09:10:04 +02:00
Sander Roosendaal
eae3e3a02b Merge branch 'release/v10.36' 2019-10-13 08:32:17 +02:00
Sander Roosendaal
6a171513b9 attempting to speed up 2019-10-12 16:53:11 +02:00
Sander Roosendaal
ddc17455bb excluded duplicate workouts from work load calc 2019-10-06 09:03:37 +02:00
Sander Roosendaal
78863183c2 Merge branch 'release/v10.35' 2019-10-05 21:16:55 +02:00
Sander Roosendaal
48906faaff adding workouts not attached to sessions 2019-10-05 21:13:48 +02:00
Sander Roosendaal
f583d4489c Merge branch 'release/v10.34' 2019-10-05 15:33:36 +02:00
Sander Roosendaal
22b71e3728 fix 2019-10-05 15:33:18 +02:00
Sander Roosendaal
bbd405bf83 Merge branch 'release/v10.33' 2019-10-05 15:30:51 +02:00
Sander Roosendaal
e7224467c0 fix zero division 2019-10-05 15:28:27 +02:00
Sander Roosendaal
8b1d036736 Merge branch 'release/v10.32' 2019-10-05 15:21:22 +02:00
Sander Roosendaal
b37b4cfaec Merge branch 'feature/getexecution' into develop 2019-10-05 15:18:03 +02:00
Sander Roosendaal
3c93b270cb some bug fixes 2019-10-05 15:17:45 +02:00
Sander Roosendaal
db4465512c execution chart without plan 2019-10-05 15:07:25 +02:00
Sander Roosendaal
c12a2c8fe3 first version actual/executed chart for plan 2019-10-05 14:35:06 +02:00
Sander Roosendaal
65db7ee6d8 improving correlation matrix 2019-10-04 09:24:10 +02:00
Sander Roosendaal
0656ed3a26 Merge tag 'v10.31' into develop
bla
2019-10-03 17:55:29 +02:00
Sander Roosendaal
2a05c9f056 Merge branch 'release/v10.31' 2019-10-03 17:55:04 +02:00
Sander Roosendaal
fc9e680801 bug fix cloning behavior 2019-10-03 17:53:47 +02:00
Sander Roosendaal
9c3cb7d246 bla 2019-10-03 17:07:49 +02:00
Sander Roosendaal
c0f102f2f6 small bug fix active status not ignored any more plan creation 2019-10-03 11:55:14 +02:00
Sander Roosendaal
8d112952ea Merge tag 'v10.30' into develop
small improvements
2019-10-03 09:12:43 +02:00