Private
Public Access
1
0
Commit Graph

5016 Commits

Author SHA1 Message Date
Sander Roosendaal
e0b8513e63 hot fix 2019-11-19 20:51:58 +01:00
Sander Roosendaal
2e2437d426 Merge branch 'release/v10.55' 2019-11-19 20:45:40 +01:00
Sander Roosendaal
4c0b19ea96 bug fix 2019-11-19 13:10:46 +01:00
Sander Roosendaal
2b1c16d20e removing StrokeData field *bye and thanks 2019-11-19 07:57:37 +01:00
Sander Roosendaal
4bfc5866c4 bug fix 2019-11-18 08:32:15 +01:00
Sander Roosendaal
fa841a9f98 Merge branch 'release/v10.54' 2019-11-17 17:52:22 +01:00
Sander Roosendaal
9d4a629a42 bug fix 2019-11-17 17:49:11 +01:00
Sander Roosendaal
9ba5a6a145 Merge branch 'release/v10.53' 2019-11-16 16:57:49 +01:00
Sander Roosendaal
dcaec4cfa4 fixed sliders 2019-11-16 16:54:21 +01:00
Sander Roosendaal
93859fe1f3 bug fix interactive chart 2019-11-16 15:19:22 +01:00
Sander Roosendaal
40e1d2aafc bug fix 2019-11-15 12:55:37 +01:00
Sander Roosendaal
4004b9a66d Clearer message on user-passes-test 2019-11-15 12:19:23 +01:00
Sander Roosendaal
39c489b935 flex chart for swim data 2019-11-13 18:08:54 +01:00
Sander Roosendaal
1232237564 Merge branch 'release/v10.52' 2019-11-12 22:15:14 +01:00
Sander Roosendaal
dea6ad21a3 bug fix 2019-11-12 22:14:34 +01:00
Sander Roosendaal
c089fee795 force unit correction 2019-11-12 22:09:19 +01:00
Sander Roosendaal
680c64a43c bug fix 2019-11-11 19:51:56 +01:00
Sander Roosendaal
59b6577c63 Merge branch 'feature/errors' into develop 2019-11-11 17:37:17 +01:00
Sander Roosendaal
26fbf49946 removing x_right in a couple of places 2019-11-11 17:35:25 +01:00
Sander Roosendaal
2294603129 removing obsolete rowingdata(csvfile) 2019-11-11 17:31:56 +01:00
Sander Roosendaal
23909feabf deprecation warning solved 2019-11-11 17:26:32 +01:00
Sander Roosendaal
781d76d639 fixing workout charts 2019-11-11 15:22:41 +01:00
Sander Roosendaal
1edb9967fa Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall 2019-11-11 09:42:00 +01:00
Sander Roosendaal
dc425445b2 Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-11-11 09:41:28 +01:00
Sander Roosendaal
47dbb0f23c Merge tag 'v10.51' into develop
bug fix
2019-11-11 09:40:17 +01:00
Sander Roosendaal
f92cfb3f5e Merge branch 'release/v10.51' 2019-11-11 09:29:28 +01:00
Sander Roosendaal
6e149a696d bug fix 2019-11-11 09:07:46 +01:00
Sander Roosendaal
ee24c5f394 Merge branch 'release/v10.50' 2019-11-09 15:21:36 +01:00
Sander Roosendaal
647547098d changed workflow (map bug) 2019-11-09 15:16:11 +01:00
Sander Roosendaal
fe3de18edc Merge branch 'release/v10.49' 2019-11-09 14:44:56 +01:00
Sander Roosendaal
394797fc80 foutje verbeterd 2019-11-09 14:43:06 +01:00
Sander Roosendaal
c6c7f85bb3 Merge tag 'v10.48' into develop
releasing bug fixes
2019-11-08 15:43:37 +01:00
Sander Roosendaal
7cefb6441d Merge branch 'release/v10.48' 2019-11-08 15:42:21 +01:00
Sander Roosendaal
9c985f5f82 small typo 2019-11-08 15:34:24 +01:00
Sander Roosendaal
de1dd33f4e bug fixes 2019-11-08 08:42:28 +01:00
Sander Roosendaal
9703f981d1 Merge branch 'release/v10.47' 2019-11-06 18:38:30 +01:00
Sander Roosendaal
50ac712bc2 bug fix dataprepnodjango 2019-11-06 16:07:38 +01:00
Sander Roosendaal
89f607ec8b Merge tag 'hongkong' into develop
no changes - bug was in database
2019-11-04 08:48:23 +01:00
Sander Roosendaal
01ca362c87 nothing 2019-11-03 17:18:56 +01:00
Sander Roosendaal
0874746d1b nothjin 2019-11-03 17:18:27 +01:00
Sander Roosendaal
0466ca9ac7 improved testing 2019-11-03 17:01:29 +01:00
Sander Roosendaal
a7c565cef2 Merge branch 'release/v10.46' 2019-11-03 16:31:33 +01:00
Sander Roosendaal
64ce92732c bug fix count 2019-11-03 16:24:07 +01:00
Sander Roosendaal
b5f80d72aa removing trash 2019-11-03 10:14:21 +01:00
Sander Roosendaal
6e633c9562 Merge branch 'release/v10.45' 2019-11-03 10:12:19 +01:00
Sander Roosendaal
84fc9c42a6 Merge branch 'feature/forceunit' into develop 2019-11-03 10:11:46 +01:00
Sander Roosendaal
b9b83cca7e and one more tweak 2019-11-03 10:09:32 +01:00
Sander Roosendaal
0616419835 more tweaks for pytest 2019-11-03 10:06:29 +01:00
Sander Roosendaal
0468ebe54b getting pytest to work 2019-11-03 10:02:11 +01:00
Sander Roosendaal
c4642060a8 added test for Colin's file and fixed tests 2019-11-03 09:54:50 +01:00