4 Commits

Author	SHA1	Message	Date
Miguel Jacq	d3b5e1e256	Merge develop branch and fix conflicts	2018-11-13 14:45:40 +11:00
Miguel Jacq	10cdfa7631	Move GUI tests into tests/ dir and fix conftest related stuff so everything loads what it needs and passes	2018-10-13 10:35:09 +11:00
Miguel Jacq	f653e8cc04	Merge develop in and fix upload/timer functionality so that it works as described. Still needs fixing to not throw a connection error to the lucky last uploader after their upload completes and server stops due to expiry having passed	2018-10-01 16:42:54 +10:00
Miguel Jacq	8fc8e0765c	Rename test dir to tests. Rename unit_tests to tests_gui_local. Add test dependencies. Update various paths. Add GUI unit tests docs to BUILD.md	2018-09-27 15:54:46 +10:00