10 commits

Author	SHA1	Message	Date
David Baker	3e915cf0e2	Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email	2016-03-18 15:34:15 +00:00
David Baker	97c765f457	Look up bound mxid for the invited email address on the ID server and warn if it doesn't match our account.	2016-03-18 15:30:27 +00:00
Matthew Hodgson	e55a375d6f	improve RoomPreviewBar as per https://github.com/vector-im/vector-web/issues/761	2016-03-17 19:19:05 +00:00
David Baker	f1844a99e7	WIP on fixing https://github.com/vector-im/vector-web/issues/924 ... Pass the invited email through to RoomPreviewBar, display it in a temporary way currently. Remove a condition from RoomView render that appears to be functionally identical to the previous.	2016-03-17 18:38:25 +00:00
David Baker	73781f5619	doc inviterName	2016-03-10 17:43:20 +00:00
David Baker	af0597e0c8	Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.	2016-02-09 16:55:03 +00:00
Matthew Hodgson	2274cb3f7f	fix invite prompt	2016-01-18 20:18:46 +00:00
Matthew Hodgson	eb7144ef85	improve layout	2016-01-18 19:56:56 +00:00
Matthew Hodgson	491ba94230	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
Kegan Dougal	eb955eb371	Add a RoomPreviewBar which asks if you'd like to join a peeked room	2016-01-12 14:11:15 +00:00