Private
Public Access
1
0
Commit Graph

4468 Commits

Author SHA1 Message Date
Sander Roosendaal
6722d0f9b8 updated celery (requirements.txt) 2019-04-12 12:21:08 -04:00
Sander Roosendaal
c0e5b0a522 small bug fixes 2019-04-11 13:15:12 -04:00
Sander Roosendaal
f267cb4805 upgraded win development environment 2019-04-07 13:47:18 +02:00
Sander Roosendaal
4a8c1a185e Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-04-07 13:33:35 +02:00
Sander Roosendaal
c662822993 comit 2019-04-07 13:32:58 +02:00
Sander Roosendaal
43d8ec7bae Merge branch 'release/v9.75' into develop 2019-04-07 10:35:58 +02:00
Sander Roosendaal
35a6892dc9 tested 2019-04-07 10:35:39 +02:00
Sander Roosendaal
e4b0e2917a removed 500 page 2019-04-07 10:33:26 +02:00
Sander Roosendaal
0d68f90066 custom test views repair 2019-04-07 10:28:03 +02:00
Sander Roosendaal
a6766bb109 not working 2019-04-06 20:36:19 +02:00
Sander Roosendaal
0e41bb7f91 tested 2019-04-06 20:15:51 +02:00
Sander Roosendaal
295fd875e6 fix 2019-04-06 19:39:09 +02:00
Sander Roosendaal
5e835a1fdb fix of fix 2019-04-06 18:33:13 +02:00
Sander Roosendaal
b1f04581a8 fixed, tested 2019-04-06 18:27:17 +02:00
Sander Roosendaal
032364486d bug fix 2019-04-06 15:13:22 +02:00
Sander Roosendaal
5c9817a16e Merge branch 'hotfix/v9.68' into develop 2019-04-06 15:01:03 +02:00
Sander Roosendaal
6f4ce867e6 tested 2019-04-06 15:00:42 +02:00
Sander Roosendaal
778da891c7 Merge branch 'release/v9.67' into develop 2019-04-06 14:46:14 +02:00
Sander Roosendaal
9a2abcbc3c Merge branch 'release/v9.67' 2019-04-06 14:46:06 +02:00
Sander Roosendaal
d0cf2cc8ae tested 2019-04-06 14:45:56 +02:00
Sander Roosendaal
7caa4d3816 Merge branch 'feature/django2' into develop 2019-04-06 14:43:50 +02:00
Sander Roosendaal
2069391e93 tested 2019-04-06 14:43:39 +02:00
Sander Roosendaal
d9dbd67ef7 updated requirements 2019-04-06 08:59:50 +02:00
Sander Roosendaal
8e57463677 tested 2019-04-05 19:46:19 +02:00
Sander Roosendaal
b02179f0af Merge branch 'develop' into feature/django2 2019-04-05 19:44:16 +02:00
Sander Roosendaal
9488da2b37 passing tests 2019-04-05 19:40:39 +02:00
Sander Roosendaal
c3fda7e206 fix #459 2019-04-04 22:05:10 +02:00
Sander Roosendaal
0ff24d8aee small improvements 2019-04-03 22:22:40 +02:00
Sander Roosendaal
2049144d51 Merge branch 'release/v9.66' 2019-04-03 21:19:25 +02:00
Sander Roosendaal
9fb2523b9a fix 2019-04-03 21:17:58 +02:00
Sander Roosendaal
952e7384bb Merge branch 'hotfix/v9.65' into develop 2019-04-03 21:08:54 +02:00
Sander Roosendaal
68761b7192 Merge branch 'hotfix/v9.65' 2019-04-03 21:08:42 +02:00
Sander Roosendaal
815ef34491 bug fix tombstones 2019-04-03 21:08:25 +02:00
Sander Roosendaal
c8f7d5541c fix #455 2019-04-03 18:21:51 +02:00
Sander Roosendaal
5181f6c6ab fix #454 2019-04-03 16:27:51 +02:00
Sander Roosendaal
b8008a7c12 Merge branch 'release/v9.64' 2019-04-02 22:34:23 +02:00
Sander Roosendaal
0a4d775a9e bug fix 2019-04-02 22:34:06 +02:00
Sander Roosendaal
75df39aaf2 Merge branch 'release/v9.63' into develop 2019-04-02 22:18:06 +02:00
Sander Roosendaal
6586581609 Merge branch 'release/v9.63' 2019-04-02 22:17:53 +02:00
Sander Roosendaal
114663c542 tested 2019-04-02 22:17:44 +02:00
Sander Roosendaal
8b02c86890 Merge branch 'feature/curve' into develop 2019-04-02 22:08:42 +02:00
Sander Roosendaal
c433d493c6 parsing error check 2019-04-02 22:08:30 +02:00
Sander Roosendaal
50b7af86e1 working sliders on line collection (force curve) 2019-04-02 21:31:58 +02:00
Sander Roosendaal
03c1923828 Merge branch 'feature/forcecurve' into develop 2019-04-02 19:07:23 +02:00
Sander Roosendaal
ea649d2a49 line collection - averages do strange on sliders 2019-04-02 19:05:39 +02:00
Sander Roosendaal
d251b1ddd4 force curve with lines 2019-04-02 19:00:00 +02:00
Sander Roosendaal
e735d98dcf working force plot 2019-04-02 17:31:45 +02:00
Sander Roosendaal
d0ffaa8d49 Merge branch 'develop' into feature/forcecurve 2019-04-02 13:48:36 +02:00
Sander Roosendaal
2f69b34bc1 force curve improvements 2019-04-02 13:41:56 +02:00
Sander Roosendaal
47d4121854 plotting some help lines and data points force curve 2019-04-02 09:29:45 +02:00