11 Commits (5b49584d79fd709712817f07ab833f958de09549)

Author	SHA1	Message	Date
David Baker	1e7af106b0	Merge branch 'master' into develop	2019-03-06 11:28:54 +00:00
David Baker	63c6f600bf	Use webpack alias to resolve the languages file ... Hopefully this will end up simpler than having to figure out in riot-web what the relative path is from react-sdk's src/languageHandler.js to riot-web's webapp directory.	2019-03-01 11:30:50 +00:00
Bruno Windels	712522a16d	set chrome path for travis CI explicitly ... karma seems to be giving priority to a location where an old version is installed.	2019-02-28 12:45:43 +01:00
Bruno Windels	6bf8269bcd	riot-web is a subdirectory when running the tests	2019-02-18 17:26:09 +01:00
Bruno Windels	19190deb3c	set x perms	2019-01-09 15:20:55 +01:00
Bruno Windels	45558f5323	run both react-sdk and riot-web tests	2019-01-09 15:16:20 +01:00
Bruno Windels	509ae4cea4	run unit tests on riot-web like before	2019-01-09 15:02:20 +01:00
Bruno Windels	419726f423	set executable perms	2019-01-09 14:43:05 +01:00
Bruno Windels	481cd292ad	make e2e tests job conditional at travis.yml level	2019-01-09 14:36:32 +01:00
Bruno Windels	5ce08523f8	split up script for unit and end-to-end tests so unit tests are not run as part of e2e tests	2019-01-09 14:21:45 +01:00
Erik Johnston	ab468b5346	Refactor travis-ci to use parallel jobs	2019-01-08 11:33:12 +00:00