Private
Public Access
1
0
Commit Graph

7163 Commits

Author SHA1 Message Date
Sander Roosendaal
330c56a9a0 Merge branch 'release/v16.4.3' into develop 2021-06-03 09:00:50 +02:00
Sander Roosendaal
5dc64693d0 fix omission 2021-06-03 09:00:33 +02:00
Sander Roosendaal
8a42be2d71 small impr 2021-06-03 08:50:55 +02:00
Sander Roosendaal
bb227919a3 small impro 2021-06-01 14:06:53 +02:00
Sander Roosendaal
09a0cd896e fix 2021-05-31 17:32:55 +02:00
Sander Roosendaal
08b831f413 Merge branch 'release/v16.4.1' into develop 2021-05-31 15:45:55 +02:00
Sander Roosendaal
8099686ca4 some coverage 2021-05-31 15:45:36 +02:00
Sander Roosendaal
0320219acb bug fix 2021-05-31 13:35:34 +02:00
Sander Roosendaal
91718d4588 activity chart improvements 2021-05-31 13:34:14 +02:00
Sander Roosendaal
9c2c55f697 fix 2021-05-31 11:15:03 +02:00
Sander Roosendaal
a9f77d70da Merge branch 'feature/seilerchart' into develop 2021-05-31 11:09:09 +02:00
Sander Roosendaal
2180287866 fixing tests coverage by creating tests of new functionality 2021-05-31 11:08:44 +02:00
Sander Roosendaal
a2c41244e9 now working with ajax 2021-05-31 08:49:23 +02:00
Sander Roosendaal
9f0d4121e3 option to use power zones 2021-05-30 17:20:27 +02:00
Sander Roosendaal
8966dfec92 fix 2021-05-28 13:18:53 +02:00
Sander Roosendaal
de452fc781 proof of concept for HR, as a sstart 2021-05-28 12:35:44 +02:00
Sander Roosendaal
58874f56c0 feeling more lucky 2021-05-28 10:27:33 +02:00
Sander Roosendaal
d9900219e6 Merge branch 'feature/magicintervals' into develop 2021-05-28 10:24:01 +02:00
Sander Roosendaal
e1e16f9d41 feeling lucky 2021-05-28 10:23:52 +02:00
Sander Roosendaal
6fa8030f4c added explanation 2021-05-28 10:17:56 +02:00
Sander Roosendaal
cb3e74019b Merge branch 'develop' into feature/magicintervals 2021-05-28 09:20:29 +02:00
Sander Roosendaal
6d821c2093 fixie coverage 2021-05-28 08:55:17 +02:00
Sander Roosendaal
51b7b2387a Merge branch 'develop' into feature/magicintervals 2021-05-27 16:42:13 +02:00
Sander Roosendaal
b79b5b0c93 tasks 2021-05-27 16:27:04 +02:00
Sander Roosendaal
5f9cb0e158 Merge branch 'hotfix/valueerror' into develop 2021-05-27 10:05:50 +02:00
Sander Roosendaal
eb228e0102 fix 2021-05-27 10:05:34 +02:00
Sander Roosendaal
8131b644ce Merge branch 'develop' into feature/magicintervals 2021-05-26 18:11:09 +02:00
Sander Roosendaal
9389b70db3 Merge branch 'release/v16.3.1' 2021-05-26 18:09:51 +02:00
Sander Roosendaal
071d0c42ee removing print statements 2021-05-26 18:09:38 +02:00
Sander Roosendaal
ba61f5ba94 Merge branch 'release/v16.3.0' 2021-05-26 17:40:44 +02:00
Sander Roosendaal
9cf338c5d0 Merge branch 'feature/c2times' into develop 2021-05-26 16:04:16 +02:00
Sander Roosendaal
3d6229a1dd coverage stuff 2021-05-26 16:03:59 +02:00
Sander Roosendaal
9572a18263 fixing c2 timezone stuff - hope it's better now 2021-05-26 15:43:54 +02:00
Sander Roosendaal
9344677ed5 sd 2021-05-26 13:10:56 +02:00
Sander Roosendaal
fc40296a98 ruptures 2 2021-05-26 13:10:46 +02:00
Sander Roosendaal
d4d6ba5922 Merge branch 'feature/wps' into develop 2021-05-25 08:53:28 +02:00
Sander Roosendaal
9f84422b3d test 2021-05-25 08:46:33 +02:00
Sander Roosendaal
a008762808 some more testing coverage nuances 2021-05-25 08:45:49 +02:00
Sander Roosendaal
d57b3910b6 adding some tests 2021-05-25 08:02:23 +02:00
Sander Roosendaal
fb03c2b863 fixing a bug 2021-05-24 22:04:08 +02:00
Sander Roosendaal
37a063950f adding error checking 2021-05-24 21:58:31 +02:00
Sander Roosendaal
5437ff6e2f adding update wps to upload routine 2021-05-24 21:56:23 +02:00
Sander Roosendaal
2e2aa85390 Merge branch 'hotfix/bugc2' into develop 2021-05-24 21:21:06 +02:00
Sander Roosendaal
4989b1fbe8 Merge branch 'hotfix/bugc2' 2021-05-24 21:21:00 +02:00
Sander Roosendaal
72c4196bef bug fix 2021-05-24 21:20:52 +02:00
Sander Roosendaal
d469d4b226 adding median wps 2021-05-24 21:12:21 +02:00
Sander Roosendaal
0b3cf44be1 Merge branch 'feature/newc2' into develop 2021-05-24 20:54:37 +02:00
Sander Roosendaal
4839b64975 coverage 2021-05-24 20:54:24 +02:00
Sander Roosendaal
447284a5d9 no 2021-05-22 17:18:11 +02:00
Sander Roosendaal
3e441302b1 Merge branch 'hotfix/v16.2.6' into develop 2021-05-22 17:01:09 +02:00