67 commits

Author	SHA1	Message	Date
Matthew Hodgson	57e62bf0ba	remove change avatar from here as it's now in the header	2016-01-15 15:50:38 +00:00
Matthew Hodgson	4a2c2d9656	fix broken merge and revert some of 243b2e45 and document evil magic numbers	2016-01-15 14:22:17 +00:00
manuroe	f868f7813b	Room settings: Added notifications mute checkbox	2016-01-14 19:06:48 +01:00
Matthew Hodgson	e4671205d8	right imagery	2016-01-14 17:24:57 +00:00
Matthew Hodgson	7a1e6bbe7e	fix merge conflicts	2016-01-13 18:00:04 +00:00
Matthew Hodgson	05c7891874	fix NPE	2016-01-13 17:54:33 +00:00
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	f715662d18	merge in develop, fixing conflicts	2016-01-13 13:06:27 +00:00
Matthew Hodgson	3934b42ac8	s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier	2016-01-13 13:01:00 +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	4f14ead741	idiot - fix bind warnings	2016-01-10 04:22:09 +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