Richard van der Hoff
4a22fb9763
Merge commit '26e6632' into rav/roomview_works
2016-02-23 13:25:09 +00:00
Richard van der Hoff
21850d7e2f
Merge commit 'd7b3a24' into rav/roomview_works
2016-02-23 13:24:58 +00:00
Richard van der Hoff
9eff426819
Merge commit '71e2495' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:24:38 +00:00
Richard van der Hoff
6aaced04fa
Merge commit 'd2a731e' into rav/roomview_works
2016-02-23 13:02:26 +00:00
Richard van der Hoff
776b6a26c3
Merge commit '9a0ea56' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00
Richard van der Hoff
b1093f3f4b
Merge commit 'e972686' into rav/roomview_works
2016-02-23 12:57:53 +00:00
Richard van der Hoff
4c571cf1bf
Merge commit 'eb91faf' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:56:54 +00:00
Richard van der Hoff
7f4f30d7d5
Merge commit 'e3feae3' into rav/roomview_works
2016-02-23 12:01:53 +00:00
Richard van der Hoff
3acfab48fc
Merge commit '014acba' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:00:54 +00:00
Richard van der Hoff
8161a18efd
Merge commit 'b1a6575' into rav/roomview_works
2016-02-23 11:56:51 +00:00
Richard van der Hoff
26e66326a2
Link search results to the right room
...
Fixes https://github.com/vector-im/vector-web/issues/980
2016-02-22 12:54:22 +00:00
David Baker
d7b3a24c18
Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit
...
Fix stuck notification bug
2016-02-19 16:20:12 +00:00
David Baker
71e2495e81
Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit.
2016-02-19 14:45:02 +00:00
Matthew Hodgson
b4fe9473d5
improve error messages when failing to talk to a HS
2016-02-19 14:17:41 +00:00
Matthew Hodgson
d2a731e255
only resize the video element if not fullscreen
2016-02-19 01:18:53 +00:00
Matthew Hodgson
12f5407392
remove ... in error view
2016-02-18 18:16:48 +00:00
Matthew Hodgson
9a0ea56bba
don't suppress conf join/parts
2016-02-18 00:07:35 +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
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
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
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
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
0d153df417
improve registration fail error msg slightly
2016-02-15 21:58:37 +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
Richard van der Hoff
0e0d0cf4f5
post-review tweaks
2016-02-11 15:38:13 +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
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
Richard van der Hoff
0d2b042c0f
Merge pull request #148 from matrix-org/rav/keep_scrolling
...
Don't stop scrolling at the read-up-to mark.
2016-02-10 10:20:03 +00:00
David Baker
af0597e0c8
Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.
2016-02-09 16:55:03 +00:00
Richard van der Hoff
f48f28eefe
Kill another scrollToToken
...
Missed a place where we were scrolling the messagepanel manually
2016-02-09 15:50:09 +00:00
Richard van der Hoff
576b59be66
Kill off the remains of auto_peek
...
Remove some dead code.
2016-02-09 15:45:41 +00:00
Richard van der Hoff
178e99385a
Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling
2016-02-09 14:52:38 +00:00
Richard van der Hoff
30b4b91cf3
Show jump-to-bottom icon even when there is other stuff in the status bar
...
Also includes a general simplification of the classes being used in the status
bar.
This should fix vector-im/vector-web#879 . Obviously it needs corresponding
changes in the CSS in vector-web.
2016-02-09 14:45:30 +00:00
Richard van der Hoff
7fd56351a9
Fix 'unread messages' in status
...
This got broken in the previous commit
2016-02-09 12:40:11 +00:00
Richard van der Hoff
194110dd71
Merge pull request #147 from matrix-org/rav/factor_out_statusbar
...
Factor the statusbar implementation out of RoomView.
2016-02-09 11:38:40 +00:00
Richard van der Hoff
81e95ca8c1
Wire up jump-to-bottom knob
...
... which I embarassingly forgot
2016-02-09 11:36:57 +00:00
Richard van der Hoff
8641dab756
Don't stop scrolling at the read-up-to mark.
...
We want to keep things scrolling up after the read-up-to mark hits the middle
of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're
not in old history) instead of updating the scroll position when RRs arrive.
Also, when we switch back to a room, if there was no special scroll state, jump
to the end of the timeline instead of the RR mark.
2016-02-09 11:08:26 +00:00
Kegsay
da81d240e2
Merge pull request #146 from matrix-org/kegan/warning-bars-dom
...
Use constant div nesting when warning bars appear
2016-02-09 11:03:31 +00:00
Richard van der Hoff
1d9c88698f
Factor the statusbar implementation out of RoomView
...
... because RoomView must die
2016-02-08 18:08:19 +00:00