Matthew Hodgson 765174a600 merge conflict

2016-01-18 19:56:35 +00:00

..

login

Do (more) client side validation of registration parameters.

2016-01-15 13:31:41 +00:00

CreateRoom.js

use getDomain()

2016-01-13 18:15:59 +00:00

MatrixChat.js

WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted.

2016-01-18 17:39:23 +00:00

RoomView.js

merge conflict

2016-01-18 19:56:35 +00:00

ScrollPanel.js

Set our own booleans instead of using isMounted

2016-01-11 11:38:04 +00:00

UploadBar.js

Only show uploads that are going to the current room

2016-01-14 16:31:42 +00:00

UserSettings.js

Merge branch 'develop' into push-rules-settings

2016-01-18 18:00:41 +01:00