969 commits

Author	SHA1	Message	Date
Matthew Hodgson	75886c4143	make badges scale with size of RoomTile	2016-01-24 14:50:24 -05:00
Matthew Hodgson	cd853ab5b4	try for a simpler invite placeholder look & feel	2016-01-24 19:02:49 +00:00
Matthew Hodgson	292af1e59c	improve settings layout and fix FF bugs	2016-01-24 18:14:52 +00:00
Matthew Hodgson	d3bc0feb83	fix ugly wrapping bug	2016-01-24 17:54:01 +00:00
Matthew Hodgson	19bfd829d0	add scrollToBottomBar and fix spacing for status bars in general	2016-01-24 01:52:21 +00:00
Matthew Hodgson	759b318bb5	fix safari	2016-01-23 01:24:04 +00:00
Matthew Hodgson	dd19d2aaee	red bar for highlights even if there's a unreadNotify too	2016-01-22 18:04:54 +00:00
Matthew Hodgson	e0ecde6760	put a black badge on unread notifications, and a red one for unread highlights	2016-01-22 17:23:04 +00:00
Matthew Hodgson	5e21059144	Merge pull request #729 from vector-im/matthew/truncateroomlist ... truncate room list	2016-01-22 16:09:28 +00:00
Matthew Hodgson	0a32874b39	oops, reset truncate state on hide, not collapse	2016-01-22 16:09:06 +00:00
Kegan Dougal	302c63058b	Invoke onShowMoreRooms to allow parents to kick their scrollbars..	2016-01-22 15:46:58 +00:00
Matthew Hodgson	0ee1892a0b	truncate room list	2016-01-22 15:31:42 +00:00
David Baker	e11ae99a9f	Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings.	2016-01-22 14:12:29 +00:00
manuroe	ce45f0b1e6	Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF	2016-01-22 09:30:31 +01:00
Matthew Hodgson	a76167d175	correct layout for truncated lists	2016-01-21 17:38:46 +00:00
manuroe	f3064a2994	Put back removing of "When people join or leave a room" settings push rule	2016-01-21 16:37:17 +01:00
manuroe	029cf754ee	Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692) ... In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules	2016-01-21 16:16:44 +01:00
David Baker	1a248c8e5c	Merge pull request #710 from vector-im/unread_sync ... Use read receipts to calculate unread room status	2016-01-21 13:29:49 +00:00
David Baker	b913e72735	Remove member event rule as per SYN-607	2016-01-21 12:01:28 +00:00
David Baker	4d4c6e06ec	Merge remote-tracking branch 'origin/develop' into unread_sync	2016-01-21 10:39:35 +00:00
David Baker	2d917910da	Merge pull request #556 from vector-im/notif_sync ... Use unread count for room highlight state	2016-01-21 10:31:46 +00:00
David Baker	a08d00c672	Apply patch to the right branch: update for new count format	2016-01-21 10:20:45 +00:00
Matthew Hodgson	bd75234a2f	make CSS work on FF	2016-01-21 00:39:26 +00:00
Matthew Hodgson	6573ba8c20	fix up Start Chat behaviour as per Amandine's feedback	2016-01-21 00:16:26 +00:00
Matthew Hodgson	f4a2b6ab7e	Merge pull request #697 from vector-im/matthew/roompreview ... Lots of CSS bugfixes and polishing	2016-01-20 22:32:08 +00:00
Matthew Hodgson	6117e09a3f	implement the correct design for memberlist	2016-01-20 22:04:32 +00:00
Matthew Hodgson	1fd60f1e44	revert read marker css	2016-01-20 17:23:33 +00:00
David Baker	ac2e69ba28	Use new unread count methods	2016-01-20 17:20:19 +00:00
Matthew Hodgson	48052415b7	usersettings button layout	2016-01-20 17:09:53 +00:00
Matthew Hodgson	e87e22a438	rhsbutton	2016-01-20 17:06:13 +00:00
Matthew Hodgson	5b2f921190	Fix bold avatar letters	2016-01-20 17:01:19 +00:00
Matthew Hodgson	b830f43371	remove RoomAvatar; stale border-radius; fix aliases table	2016-01-20 16:59:53 +00:00
Matthew Hodgson	6332e3908e	roomsettings css fixes	2016-01-20 16:39:14 +00:00
Matthew Hodgson	82742f9f13	oops, fix tinted read up to marker correctly	2016-01-20 16:06:35 +00:00
manuroe	888fde0f53	Fixed call push notifications settings that always stayed OFF	2016-01-20 17:01:09 +01:00
David Baker	eb62456007	Update for new unread count format	2016-01-20 15:58:21 +00:00
Matthew Hodgson	60d2d45255	readd in the .mx_EntityTile_power class. don't understand why it was killed :'(	2016-01-20 15:39:42 +00:00
Matthew Hodgson	6ecdb02e81	sanitize avatar border radii	2016-01-20 15:26:48 +00:00
Matthew Hodgson	4d3918109a	skin new invite UI CSS	2016-01-20 14:58:27 +00:00
Matthew Hodgson	9a9db53e0a	fix tinting of read marker again	2016-01-20 14:58:17 +00:00
Matthew Hodgson	3e8c6a42d3	roomsettings layout tweaks	2016-01-18 19:58:02 +00:00
Matthew Hodgson	3b8e5073b5	improve layout	2016-01-18 19:57:32 +00:00
Matthew Hodgson	a775086e81	wording from amandine	2016-01-18 19:57:17 +00:00
Matthew Hodgson	d5c291ae62	Merge branch 'kegan/invite-search' into matthew/roompreview	2016-01-18 18:00:58 +00:00
Matthew Hodgson	d6f6f32c74	WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now	2016-01-18 17:37:13 +00:00
Kegan Dougal	317e1fb9cd	Merge branch 'develop' into kegan/invite-search	2016-01-18 17:33:26 +00:00
manuroe	6182c983ab	PushRules settings: Applied review remarks (2/2)	2016-01-18 18:24:53 +01:00
Kegan Dougal	ac4b221690	More CSS fun for border bottom	2016-01-18 17:22:02 +00:00
manuroe	fdf5b0a4fc	Merge branch 'develop' into push-rules-settings ... # Conflicts: # src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css	2016-01-18 18:14:20 +01:00
manuroe	7c0fffa79b	PushRules settings: Applied easy review remarks	2016-01-18 18:07:33 +01:00