OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,719 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

1719 Commits (294a8efdc46c1c81a43fa103c391dd6eeb350972)

Author SHA1 Message Date
Richard van der Hoff 10b55036f9 Merge branch 'rav/roomview_works' into develop 
Implementation of new read-marker semantics (PR #160).
 2016-02-24 17:26:46 +00:00
Richard van der Hoff 87945d2a97 Merge pull request #160 from matrix-org/rav/read_marker 
Implementation of new read-marker semantics
 2016-02-24 17:01:29 +00:00
Richard van der Hoff c9f9ccc43f Merge branch 'rav/roomview_works' into rav/read_marker 
Conflicts:
	src/components/structures/RoomView.js
 2016-02-24 17:00:49 +00:00
Richard van der Hoff 1959b03104 Land refactored roomview branch 'rav/roomview_works'. 
This branch has been sitting around a while; it includes a substantial refactor
of RoomView (into separate MessagePanel and TimelinePanel), as well as a number
of fixes.
 2016-02-24 16:52:12 +00:00
Richard van der Hoff 1009faf9dc Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups 
Don't forceUpdate the whole roomview on typing notifs
 2016-02-24 16:45:45 +00:00
Richard van der Hoff 7a19bad388 Merge pull request #170 from matrix-org/rav/video_resize 
Factor out a separate auxpanel, and cleanup the maxHeight management
 2016-02-24 16:45:25 +00:00
Richard van der Hoff 4ce3598274 Make the initialSyncLimit configurable 
I keep wanting to change this to test things, and can never find the right
place to change it. Make it configurable.
 2016-02-24 16:42:23 +00:00
David Baker 4b13d71bb4 Bump to 0.1.0 2016-02-24 14:14:53 +00:00
David Baker cd92f0ea62 Use new release of js-sdk 2016-02-24 14:06:03 +00:00
Richard van der Hoff 1e095e105a Don't update state when no change to read marker 
It turns out to be quite expensive to update the state, because we can't do
shouldComponentUpdate on any of the sub-components (because RRs and local echo
sneak in through the back door), and we don't want to trigger a whole render
cycle every time someone presses a key.
 2016-02-24 12:53:39 +00:00
Richard van der Hoff 9db58de119 remove some dead code 2016-02-23 19:09:51 +00:00
Richard van der Hoff 4f417f7a82 Merge branch 'rav/roomview_works' into rav/read_marker 2016-02-23 18:56:11 +00:00
Richard van der Hoff 029f47d91c Merge branch 'rav/roomview_works' into rav/read_marker 
Conflicts:
	src/components/structures/MessagePanel.js
	src/components/structures/TimelinePanel.js
 2016-02-23 18:55:53 +00:00
Richard van der Hoff 68e0192acc reinstate event-continuation logic 
Forgot to set prevEvent in the merge from develop, so we were never applying
the correct continuation logic.
 2016-02-23 18:43:51 +00:00
David Baker 3f51cda846 Register a s a guest even if email invite: this is ok now. 2016-02-23 18:30:35 +00:00
David Baker e2bafcbf02 Don't redirect to registration on 3pid invite: it's ok to be a guest now. 2016-02-23 18:26:15 +00:00
David Baker f1dd3d381a Merge pull request #172 from matrix-org/dbkr/guest_access_by_default 
Allow guest access by default (by specifying initial state)
 2016-02-23 18:12:54 +00:00
David Baker b2b7354018 Comment guest access initial state 2016-02-23 18:10:48 +00:00
David Baker 418bf8e39c Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this. 2016-02-23 17:55:45 +00:00
David Baker b384d8c91a Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites 
Wire up support for keypair 3pid invites.
 2016-02-23 16:37:55 +00:00
Richard van der Hoff 07822e20cb Don't forceUpdate the whole roomview on typing notifs 
updating the roomview is expensive, so we shouldn't do it every time we get a
typing notification (which may or may not correspond to a user in this
room). Push it down to RoomStatusBar, and use a state var to keep track of it.
 2016-02-23 16:17:50 +00:00
Richard van der Hoff 7a20fda7e7 Factor out a separate auxpanel, and cleanup the maxHeight management 
Basically two changes here:

1. Factor out auxpanel from RoomView
2. Rather than setting maxHeight attributes by poking directly into the DOM,
pass them down as properties.
 2016-02-23 15:54:15 +00:00
Richard van der Hoff d599c8fbd2 Merge remote-tracking branch 'origin/develop' into rav/roomview_works 2016-02-23 13:37:21 +00:00
Richard van der Hoff 2c1b353c18 Merge pull request #169 from matrix-org/rav/regemini_on_status_update 
Wire up StatusBar size changes to a geminipanel update
 2016-02-23 13:36:54 +00:00
Richard van der Hoff e656cbe8f3 Merge branch 'develop' into rav/roomview_works 2016-02-23 13:32:32 +00:00
Richard van der Hoff ac4b36c0dd Merge commit '99d2392' into rav/roomview_works 
Conflicts:
	src/components/structures/RoomView.js
 2016-02-23 13:32:23 +00:00
Richard van der Hoff 862e3c8c43 Merge commit '3f1db5a' into rav/roomview_works 2016-02-23 13:26:11 +00:00
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 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
David Baker ac9f0f204d Wire up support for keypair 3pid invites. 2016-02-23 10:15:07 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 4158a007db Give <a> elements in search results a key 
... to make react shut up about them
 2016-02-22 17:44:34 +00:00
Richard van der Hoff 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
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
David Baker 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
Matthew Hodgson a44ef5bd48 fix incomingCallBox vertical offset if MatrixToolbar is present 2016-02-19 02:21:17 +00:00
Matthew Hodgson 957ef9cdc8 fix self-highlight 2016-02-19 01:56:03 +00:00