Commit Graph

480 Commits (e81a401bbab5ef2ce12e03855211afe19067ed00)

Author SHA1 Message Date
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 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 bf70376d16 hoverover for full name of room 2015-12-12 17:29:53 +00:00
Matthew Hodgson b78add39f4 fix d&d ui 2015-12-12 16:35:40 +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 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 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
Matthew Hodgson f38c71d34b update the UI whilst searching 2015-12-11 02:25:33 +00:00
Matthew Hodgson 77464c669f switch to fake tag names for fake tags, and highlight new invites 2015-12-11 00:40:28 +00:00
Richard van der Hoff ee0f0e332a Remove redundant 'waiting_for_paginate' 2015-12-10 22:08:35 +00:00
Richard van der Hoff a863839063 Don't try to fiddle with the scroll state in search mode 2015-12-10 22:04:52 +00:00
Richard van der Hoff 669fae48ea Merge remote-tracking branch 'origin/develop' into rav/preserve_room_scroll 2015-12-10 21:53:59 +00:00
Richard van der Hoff b7699c0544 Save scroll state when swapping to non-room pages too 2015-12-10 21:53:14 +00:00
Richard van der Hoff d9782b35e1 Fix review comments
camelcasing and comments
2015-12-10 21:44:30 +00:00
Richard van der Hoff 1a3fb9aca9 Preserve scroll position when backfilling
Save the scroll state whenever the user does a scroll operation, and use that
to update the scroll after a backfill completes.
2015-12-10 21:34:10 +00:00
Richard van der Hoff a1d88722aa Avoid kicking off two pagination requests at once
Make sure that we don't end up with two concurrent pagination requests by
firing off the second from the completion handler of the first. This ends up
making the code a bit simpler.
2015-12-10 20:53:21 +00:00
Richard van der Hoff 00656fc1dc Preserve scroll offset when switching rooms
When we change rooms, save the scroll offset, and restore the scroll when we
switch back.

Hopefully this fixes https://github.com/vector-im/vector-web/issues/80.
2015-12-10 16:26:36 +00:00
Erik Johnston 1bb0f4859f Merge pull request #48 from matrix-org/erikj/search-compat
Handle the fact that newer homeservers return lists rather than dicts for /search
2015-12-10 14:05:09 +00:00
Erik Johnston 5a1853210e Handle the fact that newer homeservers return lists rather than dicts 2015-12-10 13:58:06 +00:00
Matthew Hodgson 072130466c hopefully fix vector-im/vector-web#475 2015-12-08 19:49:16 +00:00
Kegan Dougal 8edfd60b64 Actually use room.name on invites. Fixes #321 2015-12-08 10:21:40 +00:00
Kegsay 47b50be4b5 Merge pull request #47 from matrix-org/kegan/resending
Resend ordering glue
2015-12-07 17:00:36 +00:00
Kegan Dougal b64e5d49cc Add magic flag to say 'dump pending events to the end' 2015-12-07 15:33:58 +00:00
Kegan Dougal b110e315ec Add removeFromQueue function to cancel sending a queued event 2015-12-07 11:36:28 +00:00
Matthew Hodgson 08d7c0232a svgize images 2015-12-06 22:07:49 +00:00
David Baker 681138678e Fix bolding 2015-12-04 19:14:14 +00:00
Kegsay ae615b5c5e Merge pull request #46 from matrix-org/kegan/ops-level-update
Recalculate levels when the member prop is updated.
2015-12-04 16:27:56 +00:00
David Baker 142ac67799 Add a logic class to determine whether an event affects a room's unread count / status & use it 2015-12-04 16:20:05 +00:00
Kegan Dougal 257dc62a73 Recalculate levels when the member prop is updated. 2015-12-04 16:15:55 +00:00
David Baker 29b3b237d5 Refresh room list on timeline event even if it doesn't change highlight status since we still want to update the ordering. Fixes #413. 2015-12-04 14:24:02 +00:00
David Baker 6a67342d02 Comment + 1 2015-12-04 12:02:54 +00:00
David Baker 141d757a01 Don't recalculate atBottom here - we do it in onScroll and it should only be necessary to do it once. Also remove the magic 150px leeway. 2015-12-04 12:00:55 +00:00
David Baker c0391145e5 Merge pull request #45 from matrix-org/file_uploads
Improve file uploads
2015-12-03 10:57:55 +00:00
David Baker 4c2fe55fdc Don't show the error dialog if the request was canceled. Handle 'request entity too large'. 2015-12-03 10:52:06 +00:00
David Baker e8f5131ed6 Make file uploads cancelable, make them not go weird if you change rooms, error if they fail and move upload status bar out into its own component. 2015-12-02 18:16:16 +00:00
Matthew Hodgson aeb8e21b5d better typing test :D 2015-12-02 17:38:02 +00:00
Kegan Dougal cd13041b31 Make the X on the desktop notification bar work again
See vector-im/vector-web #464 for more info.
2015-12-02 16:35:16 +00:00
Kegsay aceb85130e Merge pull request #44 from matrix-org/kegan/vector-references
Remove all references to 'Vector'
2015-12-02 09:39:34 +00:00
David Baker 40e4ae9759 Remove temporary vector stuff as the sister PR makes it obsolete. 2015-12-01 18:34:01 +00:00
David Baker 6978436b07 Update component index 2015-12-01 18:33:46 +00:00