62745 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	bb184c12a1	fix NPE	2015-12-17 11:56:41 +00:00
Matthew Hodgson	1a90a2c426	position the inbound call box correctly, and fix various issues with when the video preview and callview are shown	2015-12-17 02:53:53 +00:00
Matthew Hodgson	d979a028a5	position the inbound call box correctly, and fix various issues with when the video preview and callview are shown	2015-12-17 02:49:09 +00:00
Richard van der Hoff	5eff6140e0	Merge pull request #56 from matrix-org/rav/fix_scroll_fail ... Hacky fixes to jumpy scroll when backfilling	2015-12-16 18:16:04 +00:00
Matthew Hodgson	4327a2302d	spell out affected versions	2015-12-16 18:05:15 +00:00
Richard van der Hoff	dc13b944bc	Hacky fixes to jumpy scroll when backfilling ... Keep resetting our scroll offset until the DOM believes us. Hopefully this will fix vector-im/vector-web#528.	2015-12-16 17:57:32 +00:00
Kegan Dougal	e8f82527d1	Listen for room deletions and refresh the room list when it happens	2015-12-16 16:27:46 +00:00
Kegan Dougal	f7aa8be1c1	Add a forget button. Add left rooms to the "historical" tab. ... Call /forget when the forget button is clicked. Number of shortcomings: - We need to lazy load the historical list (atm we never get the list of left rooms; things only go into that list if you leave the room whilst running) - Once a room is forgotten we need to physically nuke it from the JS SDK. - Need icon for forget room.	2015-12-16 16:06:29 +00:00
Kegsay	186b727303	Merge pull request #54 from matrix-org/kegan/hide-fs-users ... Do not show conf user join/parts	2015-12-16 13:56:55 +00:00
Kegsay	856156ef5c	Merge pull request #527 from vector-im/kegan/hide-fs-user ... Pass a userId rather than a RoomMember to isConferenceUser	2015-12-16 13:56:50 +00:00
Richard van der Hoff	524563d627	Merge pull request #55 from matrix-org/rav/codedup ... use RoomView.ScrollToBottom instead of reimplementing it	2015-12-16 13:41:03 +00:00
Richard van der Hoff	f24b7ba67c	use RoomView.ScrollToBottom instead of reimplementing it	2015-12-16 13:31:36 +00:00
Kegan Dougal	c8ca1dd8d0	Pass a userId rather than a RoomMember to isConferenceUser ... Because invites do not have RoomMembers because we don't have an m.room.member event for them, just a user ID, and we want to detect conf users at invite time.	2015-12-16 11:55:13 +00:00
Kegan Dougal	09e0d10d32	Do not show conf user join/parts	2015-12-16 11:54:29 +00:00
Kegsay	8aaef34319	Merge pull request #53 from matrix-org/kegan/dont-notify-immediately ... Don't notify for events until the SDK is PREPARED	2015-12-15 17:07:09 +00:00
Kegan Dougal	6aefb3be90	Don't notify for events until the SDK is PREPARED else you can notify for stale events	2015-12-15 17:01:16 +00:00
Matthew Hodgson	d945050de6	fix typing notifs	2015-12-15 15:59:40 +00:00
Matthew Hodgson	8ebacc572b	apply class to typing text to fix typing notifs	2015-12-15 15:59:31 +00:00
Kegan Dougal	28908c2edb	Auto-focus username box	2015-12-15 15:27:56 +00:00
Kegan Dougal	a670a7e4c4	Don't spam logging	2015-12-15 14:23:58 +00:00
Matthew Hodgson	a8d7810bfc	add fullscreen button back	2015-12-15 00:01:47 +00:00
Matthew Hodgson	d3ecce2d2e	add fullscreen button	2015-12-15 00:01:32 +00:00
Matthew Hodgson	a495aecdd8	assets for VoIP and DnD file upload	2015-12-14 23:38:24 +00:00
Matthew Hodgson	39c628d4a1	implement the 'correct' voip calling design	2015-12-14 23:37:46 +00:00
Kegsay	e81a401bba	Merge pull request #52 from matrix-org/kegan/inviter-name ... Use getSender() instead of gut wrenching event.user_id for v2 compat	2015-12-14 15:46:59 +00:00
Kegan Dougal	4488844ad9	Use getSender() instead of gut wrenching event.user_id for v2 compat	2015-12-14 15:36:34 +00:00
Kegan Dougal	0f62388d3c	Don't re-render after each /sync call	2015-12-14 11:32:22 +00:00
Richard van der Hoff	5e02522685	Merge pull request #51 from matrix-org/rav/fix_bottomleft_menu ... Fix 'Create room' and 'Settings' buttons	2015-12-14 11:25:32 +00:00
Richard van der Hoff	68cdff1159	Fix 'Create room' and 'Settings' buttons ... These buttons were broken by PR #49... wire them up correctly.	2015-12-14 11:07:59 +00:00
Matthew Hodgson	ead6d5a25e	backfill on accepting invites	2015-12-13 15:18:44 +00:00
Matthew Hodgson	352865ee9d	Merge pull request #49 from matrix-org/rav/preserve_room_scroll ... Preserve scroll offset when switching rooms	2015-12-13 14:48:44 +00:00
Matthew Hodgson	5ce917ba84	merge in develop	2015-12-13 14:47:53 +00:00
Matthew Hodgson	c553258aff	add dedicated leave button to header	2015-12-13 13:49:54 +00:00
Matthew Hodgson	6ad6ed2a49	factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now	2015-12-13 13:49:28 +00:00
Matthew Hodgson	43ab6074c9	sacrifice a herd of goats to correctly size the remote video element when on a call. turns out flexbox isn't smart enough to let us say that the minimum height of the element should be the (scaled) intrinsic height of the video stream, and that the max height should be ~80% of the height of the normal timeline. so we fudge it with JS instead, which turns out to work fine. after a lot of poking at flexbox i'm fairly convinced this is a fundamental limitation: the implicit height of the video tag can only be used as the minimum height of the auxPanel if you give up on the flexbox shrink/grow being able to constrain it too. there's a chance I made a mistake, but whatever, this works well enough.	2015-12-13 04:32:48 +00:00
Matthew Hodgson	9c8984b308	fix vertical alignment of voip buttons	2015-12-13 04:14:20 +00:00
Matthew Hodgson	c2061ed439	revert dd08f53756 - do this in JS instead	2015-12-13 04:08:35 +00:00
Matthew Hodgson	96cddc5ca8	fix layout for long room names & topics	2015-12-12 17:30:08 +00:00
Matthew Hodgson	bf70376d16	hoverover for full name of room	2015-12-12 17:29:53 +00:00
Matthew Hodgson	dd08f53756	don't let auxpanel push out the height of the roomview	2015-12-12 17:15:45 +00:00
Matthew Hodgson	056017007a	improve look and feel of upload cancel	2015-12-12 16:41:32 +00:00
Matthew Hodgson	b78add39f4	fix d&d ui	2015-12-12 16:35:40 +00:00
Matthew Hodgson	7cfca3ff4d	Merge pull request #499 from vector-im/rav/mute_icon ... Add a 'muted' icon for voip calls	2015-12-11 15:32:08 +00:00
Matthew Hodgson	1f54467e6f	Merge pull request #50 from matrix-org/rav/mute_icon ... Use the 'muted' icon when the mic is muted during a call	2015-12-11 15:31:27 +00:00
Richard van der Hoff	0beafeddb9	Use the 'muted' icon when the mic is muted during a call	2015-12-11 15:01:16 +00:00
Richard van der Hoff	c36d1df417	Add a 'muted' icon for voip calls ... ... because even a crappy one is better than nothing	2015-12-11 15:00:25 +00:00
Richard van der Hoff	0d47495e04	RoomView: Remove another redundant unreadMessageCount reset ... There's never any need to reset the unreadMessageCount in ComponentDidUpdate, as an update can never cause there to be *fewer* unread messages. Instead we rely on the reset in onMessageListScroll.	2015-12-11 11:04:12 +00:00
Matthew Hodgson	762281cd96	fix vertical spacing of roomheader	2015-12-11 03:39:13 +00:00
Matthew Hodgson	3b245f0131	discard stale search results	2015-12-11 03:22:44 +00:00
Matthew Hodgson	af3c43ca76	show result counts	2015-12-11 02:58:59 +00:00