ac4b36c0dd
Merge commit '99d2392' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:32:23 +00:00
862e3c8c43
Merge commit '3f1db5a' into rav/roomview_works
2016-02-23 13:26:11 +00:00
4a22fb9763
Merge commit '26e6632' into rav/roomview_works
2016-02-23 13:25:09 +00:00
21850d7e2f
Merge commit 'd7b3a24' into rav/roomview_works
2016-02-23 13:24:58 +00:00
9eff426819
Merge commit '71e2495' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:24:38 +00:00
6aaced04fa
Merge commit 'd2a731e' into rav/roomview_works
2016-02-23 13:02:26 +00:00
776b6a26c3
Merge commit '9a0ea56' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00
b1093f3f4b
Merge commit 'e972686' into rav/roomview_works
2016-02-23 12:57:53 +00:00
4c571cf1bf
Merge commit 'eb91faf' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:56:54 +00:00
7f4f30d7d5
Merge commit 'e3feae3' into rav/roomview_works
2016-02-23 12:01:53 +00:00
3acfab48fc
Merge commit '014acba' into rav/roomview_works
...
Conflicts:
src/components/structures/RoomView.js
2016-02-23 12:00:54 +00:00
8161a18efd
Merge commit 'b1a6575' into rav/roomview_works
2016-02-23 11:56:51 +00:00
d673249681
Wire up StatusBar size changes to a geminipanel update
...
When the statusbar changes size, we need to tell the gemini panel to
update. This is slightly tortuous as figuring out the size of the statusbar
isn't completely trivial.
Fixes https://github.com/vector-im/vector-web/issues/945 and
https://github.com/vector-im/vector-web/issues/986
2016-02-23 11:06:16 +00:00
ac9f0f204d
Wire up support for keypair 3pid invites.
2016-02-23 10:15:07 +00:00
bb6a36b911
Merge pull request #167 from matrix-org/rav/fix_image_load
...
Update the scroll offset when images load
2016-02-22 17:53:36 +00:00
3f1db5ac86
Merge pull request #166 from matrix-org/rav/keys_on_search_highlights
...
Give <a> elements in search results a key
2016-02-22 17:51:47 +00:00
4158a007db
Give <a> elements in search results a key
...
... to make react shut up about them
2016-02-22 17:44:34 +00:00
99d2392b6f
Update the scroll offset when images load
...
In order to deal with image-loading reshaping the DOM, wire up
ScrollPanel.checkScroll to the image load events.
Fixes https://github.com/vector-im/vector-web/issues/984
2016-02-22 17:43:33 +00:00
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
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
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
b4fe9473d5
improve error messages when failing to talk to a HS
2016-02-19 14:17:41 +00:00
c053f90b18
Merge pull request #164 from matrix-org/make_room_links_valid
...
Make the links we emit for room URLs valid
2016-02-19 11:40:11 +00:00
a44ef5bd48
fix incomingCallBox vertical offset if MatrixToolbar is present
2016-02-19 02:21:17 +00:00
957ef9cdc8
fix self-highlight
2016-02-19 01:56:03 +00:00
d2a731e255
only resize the video element if not fullscreen
2016-02-19 01:18:53 +00:00
7f310ce307
fix nasty overscroll bug on video element caused by inline v. block
2016-02-19 01:18:37 +00:00
dc94df4b06
accomodate 800px wide thumbs and support horizontal scaling
2016-02-18 19:09:58 +00:00
12f5407392
remove ... in error view
2016-02-18 18:16:48 +00:00
aef04d682b
Make the links we emit for room URLs valid rather than relying on the onClick handler (ie. make them work if you c+p them)
2016-02-18 18:16:39 +00:00
4d7eb5795c
tint border-left
2016-02-18 00:32:46 +00:00
9a0ea56bba
don't suppress conf join/parts
2016-02-18 00:07:35 +00:00
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
e9726865fc
Merge pull request #162 from matrix-org/rav/keep_redactions
...
Handle redacted events
2016-02-17 21:42:39 +00:00
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
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
b087157855
Merge branch 'develop' into rav/update_status_bar
2016-02-17 18:38:47 +00:00
b393234147
Merge pull request #158 from matrix-org/rav/refactor_eventtile_loop
...
Refactor the EventTile loop
2016-02-16 22:25:49 +00:00
38a2a61b38
back out hacky previous commit as #946 only happens when gemini is disabled
2016-02-16 19:39:22 +00:00
34d0fc890a
disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946
2016-02-16 17:39:32 +00:00
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
f992caadd7
Position read-marker 1/3 of the way down, not halfway down.
2016-02-15 23:07:08 +00:00
21a7d15e68
MessagePanel: Fix missing import
2016-02-15 23:07:08 +00:00
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
db09d3d9e4
Move ghost-read-marker logic to MessagePanel
2016-02-15 23:05:58 +00:00
63511d4e71
Refactor the EventTile loop
...
... so that it's a bit more tractable.
2016-02-15 23:05:42 +00:00
06133b0467
Add a null guard for matrix client TimelinePanel.componentWillUnmount
...
client can be null when unmounting
2016-02-15 23:04:21 +00:00
687eae7f43
stop floods of notifs when doing a logout+login
2016-02-15 22:07:08 +00:00
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
ca56b7ec2d
match partial names in memberlist
2016-02-15 20:43:43 +00:00
Richard van der Hoff