4 Commits

Author	SHA1	Message	Date
akshayaurora	33c89b47d8	revert dynamic loading of screens and fix qrscanning	2015-09-03 14:22:25 +02:00
akshayaurora	c121c1aa4e	reorganize files and bring code inline with current master ... Conflicts: lib/simple_config.py	2015-09-03 14:20:37 +02:00
qua-non	9938316400	merge dashboard back into ui	2015-09-03 14:18:37 +02:00
qua-non	30126c544b	new combined tablet&mobile design on top of 1.9.x branch WIP	2015-09-03 14:14:51 +02:00