53 Commits (97611cfd27b83dd53c657b08dfe6ab7c3ceae73d)

Author	SHA1	Message	Date
Richard van der Hoff	69ce3c43cf	Revert "Merge branch 'develop' into rav/karma" ... The karma tests don't pass yet, and aren't ready to land on develop. This reverts commit 438453e61a, reversing changes made to 50f94eb040.	2016-04-13 17:17:45 +01:00
Richard van der Hoff	a512e600a7	tests: Don't add the div to the DOM	2016-04-13 11:16:38 +01:00
Richard van der Hoff	429d110212	Run some tests under karma ... Including a regression test for https://github.com/vector-im/vector-web/issues/1314	2016-04-13 10:15:04 +01:00