Luke Barnard 619830617a Merge branch 'develop' into luke/ilag-i18n ...

In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json

2017-06-05 16:08:03 +01:00

..

components

Merge branch 'develop' into new-guest-access

2017-05-28 22:58:18 +01:00

i18n

Fix languages.json

2017-06-01 21:10:32 +02:00

img

Fix a load of warnings in the tests

2016-10-11 14:20:40 +01:00

stores

Modify RVS test to wait until room loaded

2017-06-02 09:22:48 +01:00

utils

Don't include src in the test resolve root

2017-05-25 23:13:49 +01:00

.eslintrc.js

Add mocha env for tests in eslint config

2017-01-23 14:16:25 +00:00

all-tests.js

Make it possible to only run one test file each time

2016-04-07 17:49:39 +01:00

mock-clock.js

Some basic tests for MessagePanel

2016-03-31 00:48:46 +01:00

skinned-sdk.js

Sort alphabetically (and name consistently)

2016-06-17 15:46:31 +01:00

test-utils.js

Fix tests

2017-05-26 11:58:45 +01:00