Kegan Dougal
a0c5b30fd6
Fix vector-im/vector-web#851 by truncating the search results
2016-02-05 15:24:51 +00:00
Kegan Dougal
ef9b4ab1e6
Log when sessions are saved/restored/not found
2016-02-05 13:32:01 +00:00
David Baker
9525808cd0
Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers
...
Unregister some event handlers we'd registered but never unregister.
2016-02-05 10:48:22 +00:00
David Baker
0ae548cf5d
Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs
...
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-05 10:15:55 +00:00
David Baker
239abf4eca
Style things from PR comments
2016-02-05 09:51:09 +00:00
David Baker
63776509a6
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-04 18:06:24 +00:00
Richard van der Hoff
5ae532dae2
Merge pull request #138 from matrix-org/rav/update_rr_semantics
...
Tweaks to the semantics for sending RRs and handling room switches
2016-02-04 17:42:15 +01:00
Richard van der Hoff
d14c1a82b2
Tweaks to the semantics for sending RRs and handling room switches
...
* Only send read receipts when we are at the bottom of a room; this is a simple
and effective way of stopping the green bar of doom from jumping down the
room slightly behind the scroll.
* Jump to read-up-to mark when switching back to a room if we were following
the live timeline before.
2016-02-04 16:27:49 +00:00
David Baker
c0d93a78bc
Unregister some event handlers we'd registered but never unregister.
2016-02-04 15:55:24 +00:00
Kegsay
75ff4f0f95
Merge pull request #135 from matrix-org/kegan/sync-limit
...
Set the sync limit back to sane levels
2016-02-04 15:47:31 +00:00
David Baker
d1467d2319
Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join
...
Prompt for display name before joining your first room
2016-02-04 15:32:52 +00:00
David Baker
167da10b8b
address PR comments
2016-02-04 15:07:30 +00:00
David Baker
6e424780f1
typo
2016-02-04 14:38:05 +00:00
David Baker
d0c8dadaf6
Merge pull request #134 from matrix-org/dbkr/fix_preview_bar
...
Put the room preview bar back for rooms that aren't peekable
2016-02-04 14:10:18 +00:00
Richard van der Hoff
309f1e2c8f
Merge pull request #131 from matrix-org/rav/search_clickthrough
...
Enable clicking on search results to switch to the result in context.
2016-02-04 15:06:39 +01:00
Richard van der Hoff
63b50ed230
Merge pull request #132 from matrix-org/rav/fix_404_on_echo
...
Don't try to use local echoes as scroll tokens
2016-02-04 15:05:35 +01:00
Richard van der Hoff
8f5c739886
Clean up scrollToken assignment
2016-02-04 14:05:16 +00:00
Kegan Dougal
f3fa5d6a2a
Set the sync limit back to sane levels
2016-02-04 13:30:25 +00:00
David Baker
b0da54533d
Don't do this check - it's not valid since we set the room in onRoomName
2016-02-04 13:25:45 +00:00
David Baker
891f4761a0
Add comments and only set a room / init the timeline if we don't already have a room
2016-02-04 13:21:42 +00:00
Kegsay
6c9d48bd3a
Merge pull request #128 from matrix-org/kegan/alias-settings
...
Split out alias settings into its own component: AliasSettings
2016-02-04 13:14:19 +00:00
David Baker
574560cc05
remove listener on unmount
2016-02-04 13:06:59 +00:00
David Baker
47fef0896f
Prompt for display name before joining your first room (if you haven't set one).
...
Fixes https://github.com/vector-im/vector-web/issues/758
2016-02-04 11:49:10 +00:00
David Baker
3c2c2b051b
Listen for Room and use this to init the timeline, not Room.name
2016-02-04 11:29:00 +00:00
David Baker
c9a3ad31ab
Comment error handling
2016-02-04 11:17:39 +00:00
David Baker
5c430395ea
init timeline when we get the room, as otherwise we never load it after joining
2016-02-04 10:50:21 +00:00
Kegsay
3c2e0c1928
Merge pull request #133 from matrix-org/kegan/version-stamp
...
Add MatrixChat.onNewVersion to trigger the new version bar
2016-02-03 17:09:28 +00:00
David Baker
164c9b9031
Check error to see if it's actually a failure to peek
2016-02-03 16:53:48 +00:00
Kegan Dougal
8b96af4ccb
Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion
2016-02-03 16:51:53 +00:00
David Baker
cebc2f5306
Put the room preview bar back for rooms that aren't peekable (since we always tried to peek, it would fail which would reject the promise and cause loadingTimeline to stay true forever).
2016-02-03 16:23:57 +00:00
Kegan Dougal
7bdd9f57a5
Add MatrixChat.onNewVersion to trigger the new version bar
2016-02-03 16:16:52 +00:00
Richard van der Hoff
d7576d223d
Don't try to use local echoes as scroll tokens
...
Local echoes don't have a (usable) event id, so don't use them when remembering
the scroll state of a room.
2016-02-03 15:34:20 +00:00
David Baker
9468ff63ff
Merge pull request #129 from matrix-org/dbkr/no_auto_join
...
Don't trigger joins from the room directory: always peek
2016-02-03 15:18:38 +00:00
David Baker
11df2fc285
Merge remote-tracking branch 'origin/develop' into dbkr/no_auto_join
2016-02-03 15:18:18 +00:00
Richard van der Hoff
e747beac58
Enable clicking on search results to switch to the result in context.
2016-02-03 15:06:52 +00:00
Richard van der Hoff
223675bafb
Merge PR #126 from matrix-org/rav/link_to_event
...
Implement direct-to-event linking.
2016-02-03 14:54:27 +00:00
Richard van der Hoff
8f703f4a2e
Merge PR #122 from matrix-org/rav/timeline_window
...
Convert RoomView to using a TimelineWindow
2016-02-03 14:54:04 +00:00
Richard van der Hoff
e01d61dfeb
Merge branch 'rav/timeline_window' into rav/link_to_event
...
Conflicts:
src/components/structures/MatrixChat.js
src/components/structures/ScrollPanel.js
2016-02-03 14:12:28 +00:00
Richard van der Hoff
2479c81cf6
Merge remote-tracking branch 'origin/develop' into rav/timeline_window
2016-02-03 14:09:50 +00:00
Richard van der Hoff
c82b364ca8
Address review comments
...
Mostly renaming things and adding comments.
2016-02-03 08:03:10 +00:00
Richard van der Hoff
101f0219c4
Merge pull request #130 from matrix-org/rav/fix_rr_react_warning
...
Fix react warnings when a RR animation is happening during room switch
2016-02-02 19:07:57 +01:00
Richard van der Hoff
3b1ed3a014
Fix react warnings when a RR animation is happening during room switch
...
If the animation of an RR removal is active when we change room, we end up
getting a callback after the RoomView has been unmounted. Guard against this to
avoid getting React warnings.
2016-02-02 17:59:11 +00:00
David Baker
b0f0d5f6d0
Null check room because those events will be emitted before the room is stored.
2016-02-02 16:34:41 +00:00
Kegsay
20f77d1224
Merge pull request #125 from matrix-org/kegan/trailing-slash
...
Strip trailing slashes on HS/IS URLs on register/login
2016-02-02 16:04:19 +00:00
David Baker
1cabe2ec37
Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join)
2016-02-02 15:50:15 +00:00
David Baker
4e4e5be9a1
Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818 .
2016-02-02 14:14:18 +00:00
Kegan Dougal
ce789ba962
Split out alias settings into its own component: AliasSettings
2016-02-02 12:46:14 +00:00
David Baker
34ba00d0ae
Merge pull request #127 from matrix-org/dbkr/fix_upgrade_with_email
...
Don't assert that we're not logged in before starting registration
2016-02-01 17:07:10 +00:00
David Baker
c187eda832
Don't assert that we're not logged in before starting registration because uprading is now a thing.
2016-02-01 16:53:39 +00:00
Richard van der Hoff
d9e13780b8
Implement direct-to-event linking.
...
This adds support for links to particular event ids: add /<eventId> to the URL
for a room.
This commit also ensures that we scroll to the 'read marker' when switching to
a room which has no previous scroll state, as well as preventing that marker
from going past the middle of the screen.
This also reinstates the preservation of scroll state when switching rooms,
which was disabled previously.
2016-02-01 16:31:12 +00:00
