8 commits

Author	SHA1	Message	Date
Matthew Hodgson	5f763f8ebb	merge develop	2016-01-13 14:03:54 +00:00
Matthew Hodgson	c9c496f0e5	WIP all new roomsettings	2016-01-13 13:15:13 +00:00
Matthew Hodgson	684255044a	switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings	2016-01-10 12:56:45 +00:00
Matthew Hodgson	ef00a1624d	fix up RoomSettings somewhat and implement room colors	2016-01-08 03:22:38 +00:00
Kegan Dougal	c64f36c81b	Merge branch 'develop' into kegan/guest-access	2016-01-07 13:21:06 +00:00
Matthew Hodgson	0772f50fab	update copyright for 2016	2016-01-07 04:06:52 +00:00
Kegan Dougal	d729dee31d	Make the settings page load for guests. Add checkboxes for guest r/w	2016-01-05 17:34:25 +00:00
Kegan Dougal	bf46ce19e0	Merge and move RoomHeader/RoomSettings	2015-11-27 10:42:03 +00:00