1298 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kegan Dougal	2986b241c4	Add jenkins.sh for builds	2016-02-02 15:44:41 +00:00
David Baker	d1dc082489	Remove empty if block	2016-02-01 18:02:52 +00:00
Richard van der Hoff	f94272c539	Add some crude CSS for highlighting the selected event ... (To be useful, this needs functionality which hasn't yet landed in react-sdk).	2016-01-30 00:43:47 +00:00
David Baker	3b18b9b54b	Fix connection lost bar CSS	2016-01-29 10:07:22 +00:00
David Baker	3585437af9	Merge pull request #800 from vector-im/dbkr/guest_warning_bar ... CSS that changes the connection lost bar into a more general 'warning bar'	2016-01-28 13:44:09 +00:00
David Baker	6a36b022e4	New style guest warning bar	2016-01-28 13:00:44 +00:00
David Baker	35600f11ad	CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning	2016-01-28 09:19:28 +00:00
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	12afbcbc45	Merge pull request #727 from vector-im/dbkr/rule_kinds ... Add vector rules with the appropriate kind	2016-01-22 14:15:49 +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
Kegan Dougal	0752c3a6d5	Add start:prod - same as 'npm run start' but with NODE_ENV=production	2016-01-22 13:17:09 +00:00
manuroe	87f3603047	Merge pull request #721 from vector-im/push-rules-dont-notify ... Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF	2016-01-22 11:37:58 +01: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	3a23189435	Merge pull request #716 from vector-im/push-rules-add-bot-rule ... Added notif settings for "Messages sent by bot" (#692)	2016-01-21 16:39:19 +01: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	568f9bb19d	Merge pull request #713 from vector-im/dbkr/remove_member_event_rule ... Remove member event rule as per SYN-607	2016-01-21 12:30:03 +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	0a70fe2bd1	Argh, revert accidental config commit	2016-01-21 10:30:52 +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	d979511696	Re-remove extra icons as they break favico	2016-01-20 17:20:34 +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	39eb0f9c8f	Merge pull request #687 from vector-im/push-rules-call-settings-fix ... Fixed call push notifications settings that always stayed OFF	2016-01-20 17:06:01 +01:00
manuroe	888fde0f53	Fixed call push notifications settings that always stayed OFF	2016-01-20 17:01:09 +01:00