Commit Graph

1512 Commits (2e772e2f19d18ae4aeb6c8d56fc79c90fde74b0e)

Author SHA1 Message Date
Richard van der Hoff 4c149480c9 Merge pull request #159 from matrix-org/rav/move_ghostmarker_to_messagepanel
Move the ghost-read-marker logic to MessagePanel
2016-02-17 21:44:24 +00:00
Richard van der Hoff e9726865fc Merge pull request #162 from matrix-org/rav/keep_redactions
Handle redacted events
2016-02-17 21:42:39 +00:00
Richard van der Hoff c4176ab706 Merge pull request #163 from matrix-org/rav/fix_search_clickthrough
Fix search clickthrough for HTML events
2016-02-17 21:35:39 +00:00
Richard van der Hoff e3feae32e1 Fix search clickthrough for HTML events
Switch to using a normal <a href="..."> link for search result
clickthrough. Apart from generally giving a better experience, this means that
it also works on html messages. The problem there was that we were attaching
onClick handlers to <span>s which we were then flattening into HTML with
ReactDOMServer (which meant the onClick handlers were never attached to React's
list of listeners).

To make this work without jumping through React hoops, the highlighter now
returns either a list of strings or a list of nodes, depending on whether we
are dealing with an HTML event or a text one. We therefore have a separate
HtmlHighlighter and TextHighlighter.
2016-02-17 21:06:27 +00:00
Matthew Hodgson b087157855 Merge branch 'develop' into rav/update_status_bar 2016-02-17 18:38:47 +00:00
Richard van der Hoff b393234147 Merge pull request #158 from matrix-org/rav/refactor_eventtile_loop
Refactor the EventTile loop
2016-02-16 22:25:49 +00:00
Matthew Hodgson 38a2a61b38 back out hacky previous commit as #946 only happens when gemini is disabled 2016-02-16 19:39:22 +00:00
Matthew Hodgson 34d0fc890a disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946 2016-02-16 17:39:32 +00:00
Richard van der Hoff eb91faf554 Handle redacted events
matrix-js-sdk now retains redacted events. Filter them out of the timeline.

Also put empty placeholders in the dom so that if we try to scroll to a
redacted event, we don't end up blowing up.
2016-02-16 16:08:52 +00:00
Richard van der Hoff f992caadd7 Position read-marker 1/3 of the way down, not halfway down. 2016-02-15 23:07:08 +00:00
Richard van der Hoff 21a7d15e68 MessagePanel: Fix missing import 2016-02-15 23:07:08 +00:00
Richard van der Hoff d498c5a81e Implementation of new read-marker semantics
Separate the read-up-to marker from the read-receipts, and show a status bar
when the read marker is above the screen. Move the read-marker down when it is
on the screen and there is user activity.

(This requires corresponding changes in vector-web, to provide the CSS and img)
2016-02-15 23:07:08 +00:00
Richard van der Hoff db09d3d9e4 Move ghost-read-marker logic to MessagePanel 2016-02-15 23:05:58 +00:00
Richard van der Hoff 63511d4e71 Refactor the EventTile loop
... so that it's a bit more tractable.
2016-02-15 23:05:42 +00:00
Richard van der Hoff 06133b0467 Add a null guard for matrix client TimelinePanel.componentWillUnmount
client can be null when unmounting
2016-02-15 23:04:21 +00:00
Matthew Hodgson 687eae7f43 stop floods of notifs when doing a logout+login 2016-02-15 22:07:08 +00:00
Matthew Hodgson 4b8b2ade8b fix login-on-guest-bar-NPE crash https://github.com/vector-im/vector-web/issues/930 2016-02-15 21:50:39 +00:00
Matthew Hodgson ca56b7ec2d match partial names in memberlist 2016-02-15 20:43:43 +00:00
Matthew Hodgson 61018f4f38 whitespace 2016-02-15 20:42:44 +00:00
Richard van der Hoff ab9690d3b0 Don't re-tint on unmount
Need to remember the 'ref' function is called on unmount too - we shouldn't
retint back to the room colours at this point.
2016-02-15 20:40:34 +00:00
Matthew Hodgson 6b48b626e6 fix spinner of doom 2016-02-15 20:39:02 +00:00
Matthew Hodgson 576de32ce4 show vaguely accurate default avatar 2016-02-15 22:01:22 +02:00
Matthew Hodgson dfbc88d421 fix keyboard shortcuts on logout prompt 2016-02-15 22:01:05 +02:00
Matthew Hodgson 0d153df417 improve registration fail error msg slightly 2016-02-15 21:58:37 +02:00
Matthew Hodgson af5a866596 clear upload bar correctly after upload completes by fixing a race and moving the upload_finished dispatch after clearing up the inprogress uploads data structure. I have zero idea how this ever worked... :/ 2016-02-15 21:29:56 +02:00
Matthew Hodgson 014acbab1f restore drag & drop file upload, broken by @richvdh's new timeline stuff 2016-02-15 21:16:04 +02:00
Matthew Hodgson b1a6575b1d remove ugly join & reject error msgs in favour of modal dialogs 2016-02-15 20:59:44 +02:00
Matthew Hodgson 30e9c76089 login as guest button on the login page 2016-02-15 20:44:13 +02:00
Matthew Hodgson e17d77778f sanitize setting displayname prompt 2016-02-15 19:37:03 +02:00
Richard van der Hoff b766055f2f Merge branch 'develop' into rav/roomview_works 2016-02-15 17:24:15 +00:00
Richard van der Hoff 601a7ce9fd Merge branch 'develop' into rav/roomview_works 2016-02-15 12:19:53 +00:00
Matthew Hodgson 0c7573629a spell out that you can invite email addresses 2016-02-15 11:13:37 +02:00
Matthew Hodgson 0a37f1c478 improve the fix for https://github.com/vector-im/vector-web/issues/917 2016-02-15 09:52:57 +02:00
Matthew Hodgson 9d3b0f6075 fix https://github.com/vector-im/vector-web/issues/913 2016-02-15 00:37:59 +02:00
Matthew Hodgson 5e407b44b7 add markdown to tab complete list 2016-02-14 13:45:52 +02:00
Matthew Hodgson 5e5fdb9b96 fix vector-im/vector-web#921 2016-02-14 13:38:12 +02:00
Richard van der Hoff 3785cb3f15 Merge pull request #157 from matrix-org/rav/clicks_are_activity_too
Consider mouse-clicking as user activity
2016-02-12 10:41:27 +00:00
Richard van der Hoff 4d6131bbc4 Merge branch 'develop' into rav/roomview_works 2016-02-12 10:21:22 +00:00
Richard van der Hoff 3e8cb47abe Consider mouse-clicking as user activity
It's a bit non-sensical that moving the mouse constitutes user activity, but
clicking it does not. Fix it.
2016-02-12 10:19:45 +00:00
Richard van der Hoff 47ce14b75a Merge pull request #155 from matrix-org/rav/roomview_refactor
Refactor RoomView
2016-02-12 09:09:50 +00:00
Matthew Hodgson 605c567fde Merge pull request #156 from matrix-org/matthew/html-highlight-fix
use sanitize-html's textFilter callback to only apply highlights to textNodes
2016-02-11 16:48:17 +00:00
Richard van der Hoff 0e0d0cf4f5 post-review tweaks 2016-02-11 15:38:13 +00:00
Matthew Hodgson 1c30640a92 remove unused 'body' var; use a `finally` to clean up the temporary textfilter 2016-02-11 14:03:54 +00:00
Matthew Hodgson 92435c0865 ooops, don't forget to actually sanitize the highlights after all that 2016-02-10 23:45:07 +00:00
Matthew Hodgson d055dbe522 use sanitize-html's textFilter callback to only apply highlights to textNodes when highlighting HTML. fixes https://github.com/vector-im/vector-web/issues/294 2016-02-10 20:25:49 +00:00
Richard van der Hoff f2377fa9fe Factor out a TimelinePanel from RoomView 2016-02-10 18:41:48 +00:00
Richard van der Hoff c3692378fa Factor a stateless messagepanel out from RoomView 2016-02-10 18:41:47 +00:00
David Baker f016a327b1 Merge pull request #152 from matrix-org/dbkr/fix_room_settings_guest_exception
Don't try to fetch push rules if we're a guest: it throws.
2016-02-10 12:34:08 +00:00
David Baker 124155df00 Merge pull request #153 from matrix-org/dbkr/no_notif_settings_guests
Don't show the Notifications widget for guests…
2016-02-10 12:02:07 +00:00
David Baker 1e945cd13b Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it). 2016-02-10 11:48:35 +00:00