Richard van der Hoff
fb3a471d77
Revert "Switch js-sdk back to develop"
...
This reverts commit bf6e13dbcd
2016-03-23 13:54:20 +00:00
Richard van der Hoff
bf6e13dbcd
Switch js-sdk back to develop
...
Matthew has landed some required fix in js-sdk
2016-03-23 12:11:05 +00:00
Richard van der Hoff
1495a6ffa0
Bump react-sdk to latest develop
...
Pick up the version which optimises out onResize handler where possible
2016-03-23 12:09:09 +00:00
David Baker
d6218ca153
Actually calling functions often helps.
2016-03-23 12:02:26 +00:00
David Baker
e20c599273
Swap register & cancel buttons for matthew
2016-03-23 11:48:47 +00:00
Matthew Hodgson
c4eabe2eb4
hopefully fix https://github.com/vector-im/vector-web/issues/1242
2016-03-23 11:41:10 +00:00
Richard van der Hoff
422a1f01a4
Limit check on scrollNode.scrollTop to keep firefox happy
...
Turns out that Firefox ignores attempts to set scrollTop to
Number.MAX_VALUE. Clip it to scrollHeight.
2016-03-23 10:51:07 +00:00
Richard van der Hoff
cf17258a6c
Merge pull request #246 from matrix-org/rav/read_marker_off_by_one
...
Fix off-by-one error in read-marker advancing
2016-03-23 10:23:19 +00:00
Richard van der Hoff
7eea8e104c
Merge pull request #245 from matrix-org/rav/more_scroll_fixes
...
Another go at fixing the jumpy scroll
2016-03-23 10:23:06 +00:00
Richard van der Hoff
04c9924ad6
Fix off-by-one error in read-marker advancing
...
The fix to https://github.com/vector-im/vector-web/issues/1241 introduced an
off-by-one error which meant we would show the RM before the last event in a
room. We were actually winding the RM back one if the last message wasn't sent
by us.
2016-03-23 09:49:31 +00:00
Richard van der Hoff
272bef1606
Bump react-gemini-scrollbar version
2016-03-23 00:03:55 +00:00
Richard van der Hoff
4fd49976ae
Another go at fixing the jumpy scroll
...
The most recent problem was that we were setting _lastSetScroll whenever we
wrote to scrollTop (and ignoring the next scroll event which matched that
offset), but if there was no change to scrollTop, we wouldn't actually get a
scroll event, so would ignore some future scroll event instead.
Make sure that we only set _lastSetScroll if there's a change to scrollTop.
(Fixes https://github.com/vector-im/vector-web/issues/1162 , more)
2016-03-22 19:33:02 +00:00
Richard van der Hoff
a82c0580d2
Bump to matrix-js-sdk 0.5.0
2016-03-22 19:17:22 +00:00
Matthew Hodgson
2403eca6af
profoundly evil ugly hack to workaround amandine's invite focus issues on her note-to-self rooms
2016-03-22 17:47:52 +00:00
Richard van der Hoff
7fb5736e52
Merge pull request #244 from matrix-org/rav/no_rm_on_my_events
...
Move read-marker past our own events when we switch to a room
2016-03-22 17:44:02 +00:00
David Baker
abe4df5f1c
Merge pull request #243 from matrix-org/dbkr/error_messages
...
Add better user-facing error messages
2016-03-22 17:41:00 +00:00
Richard van der Hoff
0737d89d57
Merge pull request #242 from matrix-org/rav/read_marker
...
Make the read-marker less annoying
2016-03-22 17:37:14 +00:00
David Baker
87d853d56b
If we don't get a specific event because of permissions, say so
2016-03-22 17:33:46 +00:00
David Baker
4e9c37c069
Remove unused prop
2016-03-22 17:23:46 +00:00
Richard van der Hoff
3736fcf80e
Move read-marker past our own events when we switch to a room
...
This fixes an issue where the RM appeared before any events which were pending
when you switched away from that room
(https://github.com/vector-im/vector-web/issues/1241 ).
Also, fix a buglet in the MessagePanel which meant we didn't animate the
disappearance of a RM when it stayed at the same event but became
invisible. This didn't really cause any user-visible problems (because
typically we advance the RM at the same time as it became invisible), but
confused me a bit while I was trying to debug this.
2016-03-22 17:23:23 +00:00
David Baker
7f6eabe657
Fix doc for NeedToRegisterDialog and the place I copied it from
2016-03-22 17:20:22 +00:00
Matthew Hodgson
e23f496dfe
fix PowerSelector to support both controlled & uncontrolled variants
2016-03-22 17:17:46 +00:00
David Baker
88aa975271
Sensible error message if we can't invite because we're not allowed
2016-03-22 16:33:39 +00:00
Richard van der Hoff
c1101d978e
Turn on scroll debug again
2016-03-22 15:37:08 +00:00
David Baker
7caad2a434
More user-facing error message for event-not-found
2016-03-22 14:22:16 +00:00
David Baker
098f3e6561
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 13:54:31 +00:00
David Baker
f1219a6b8d
Register prompt for trying to set an avatar
2016-03-22 13:50:27 +00:00
Matthew Hodgson
c60a305284
oops, unbreak tags in roomsettings
2016-03-22 13:47:38 +00:00
David Baker
13f31b2a5d
Add error message for failing to join a room as a guest (which may or may not be because we're a guest: we can't tell)
2016-03-22 13:47:29 +00:00
David Baker
463212fb2a
Update error message
2016-03-22 13:19:29 +00:00
David Baker
6dce555865
Sensible error for setting room colours if you're a guest
2016-03-22 13:09:19 +00:00
David Baker
e311a963c1
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 12:59:14 +00:00
David Baker
30b76d372c
Error messages for guests creating rooms
2016-03-22 12:58:12 +00:00
Matthew Hodgson
385e1ca1fb
only let people add aliases if they canSeetAliases
2016-03-22 12:54:08 +00:00
Matthew Hodgson
80416fe583
prettify tag ui
2016-03-22 12:51:11 +00:00
David Baker
45dd192309
Merge remote-tracking branch 'origin/develop' into dbkr/error_messages
2016-03-22 12:48:13 +00:00
Matthew Hodgson
e141a44103
Merge pull request #241 from matrix-org/matthew/room-visibility
...
rework roomsettings for new visibility UI
2016-03-22 12:30:21 +00:00
Matthew Hodgson
5a2a2c5bdc
fix up and factor out mayChangeRoomAccess and fix review feedback
2016-03-22 12:26:38 +00:00
Richard van der Hoff
2ac88a3d89
Make the read-marker less annoying
...
We considered the user active if there had been a user_activity event within
the last 500ms, but those events were only raised every 500ms, so it was
possible that we would be considered inactive immediately. Use
UserActivity.userCurrentlyActive() instead, which fixes this.
Also increase CURRENTLY_ACTIVE_THRESHOLD_MS to 2 seconds.
2016-03-22 12:15:17 +00:00
Matthew Hodgson
df905cfcb7
incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite
2016-03-22 12:10:58 +00:00
Richard van der Hoff
b9d3047a93
Disable scrollpanel debug
...
... now that https://github.com/vector-im/vector-web/issues/1162 is hopefully
fixed
2016-03-22 11:58:17 +00:00
David Baker
5f1fabd982
Error message #1 : guests can't invite people. Also add a dialog box for telling people they need to register.
2016-03-22 10:57:05 +00:00
Richard van der Hoff
c31fbf1214
Merge pull request #236 from matrix-org/rav/search_pagination_spinner
...
Show a spinner when we back-paginate search results
2016-03-22 10:12:51 +00:00
Richard van der Hoff
d000870668
Merge pull request #237 from matrix-org/rav/scroll_jump
...
Only ignore scroll echoes once
2016-03-22 10:12:23 +00:00
Richard van der Hoff
74b45475be
Merge pull request #238 from matrix-org/rav/cancel_sending
...
Add 'cancel all' option to 'unsent messages' bar
2016-03-22 10:12:11 +00:00
Richard van der Hoff
f6862f03ad
Merge pull request #239 from matrix-org/rav/context_errors
...
Show an error when a direct-to-event link fails
2016-03-22 10:11:29 +00:00
Matthew Hodgson
8cfb0e9ef4
rework roomsettings for new visibility UI
2016-03-22 00:57:40 +00:00
Matthew Hodgson
4e97fe982d
improve previewbar look & feel
2016-03-21 22:05:59 +00:00
David Baker
3bd93c90b1
Splitting this over two lines confuses the word spacing
2016-03-21 18:15:01 +00:00
Richard van der Hoff
d67c64c7a6
Show an error when a direct-to-event link fails
...
If the /context request fails, pop up a modal dialog to tell the user about
it.
2016-03-21 17:29:33 +00:00
