Matthew Hodgson
5a2a2c5bdc
fix up and factor out mayChangeRoomAccess and fix review feedback
2016-03-22 12:26:38 +00:00
Minhaz A V
1875377684
Some style fixes
...
Signed-off-by: Minhaz A V <minhazav@gmail.com>
2016-03-22 17:51:17 +05:30
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
Minhaz A V
98343a065c
notification issue fixed
...
Signed-off-by: Minhaz A V <minhazav@gmail.com>
2016-03-22 03:49:46 +05:30
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
Richard van der Hoff
75f8765f88
Add 'cancel all' option to 'unsent messages' bar
...
Also, make sure we hide said bar when unsent messages are cancelled.
2016-03-21 16:49:07 +00:00
Matthew Hodgson
11be2e1cad
Merge pull request #234 from matrix-org/matthew/stop-peeking
...
if we're not peeking in a room, stop any ongoing peeking
2016-03-21 16:17:00 +00:00
Matthew Hodgson
0d31f8cb63
Merge pull request #235 from matrix-org/matthew/intercept-vector-links
...
linkify vector.im URLs directly into the app, both from HTML and non-HTML messages
2016-03-21 16:16:47 +00:00
Matthew Hodgson
462ccf89d7
inplace-edit on attribs
2016-03-21 15:54:02 +00:00
Matthew Hodgson
c3e96f8af1
incorporate review
2016-03-21 15:45:04 +00:00
Richard van der Hoff
c89906e571
Only ignore scroll echoes once
...
When the user scrolls up, and scrolls back to where they were, we want to save
the final scroll state. We were ignoring it because it looked the same as the
last autoscroll.
Fixes https://github.com/vector-im/vector-web/issues/1162
2016-03-21 14:48:17 +00:00
Matthew Hodgson
0a346350e8
warn if you don't specify an email
2016-03-21 01:15:11 +00:00
Matthew Hodgson
5bdcb64464
fix NPE
2016-03-21 00:51:45 +00:00
Matthew Hodgson
59f599af5c
prompt before giving equal ops
2016-03-21 00:49:18 +00:00
Matthew Hodgson
31ed7b9dd7
fix state caching bugs in RoomHeader
2016-03-21 00:39:33 +00:00
Richard van der Hoff
c1fa89972a
Show a spinner when we back-paginate search results
...
Hook into the existing searchInProgress state to show a spinner when we
back-paginate search.
2016-03-20 23:51:43 +00:00
Matthew Hodgson
eadd2a522f
fix room reuse semantics when starting chats
2016-03-20 13:04:03 +00:00
Matthew Hodgson
18fc8fc6c4
s/m.room.join_rule/m.room.join_rules/
2016-03-20 12:47:38 +00:00
Matthew Hodgson
bbd57f2bdf
when starting chat from memberinfo, allow guest access. in future synapse should make guest_access a default for the private_chat preset.
2016-03-20 12:39:49 +00:00
Matthew Hodgson
d54a75c913
actually, only intercept URLs which are explicitly referring to our current app
2016-03-20 12:31:30 +00:00
Matthew Hodgson
1aed9ccbf4
linkify vector.im URLs directly into the app, both from HTML and non-HTML messages
2016-03-20 03:05:07 +00:00
Matthew Hodgson
68a391e24b
implement history visibilty warnings
2016-03-19 22:33:06 +00:00
Richard van der Hoff
7712582c29
Renable debug in ScrollPanel
...
... after matthew disabled it by accident
2016-03-19 20:42:30 +00:00
Matthew Hodgson
a44ebddae0
show default displayname in ChangeDisplayName prompt
2016-03-19 02:45:06 +00:00
Matthew Hodgson
f999aa94e1
remove YYYY from timestamps to workaround https://github.com/vector-im/vector-web/issues/987
2016-03-19 02:37:18 +00:00
Matthew Hodgson
383779f718
oops, actually fix https://github.com/vector-im/vector-web/issues/308 properly...
2016-03-18 20:08:47 +00:00
Matthew Hodgson
cb9da69382
doh
2016-03-18 20:01:19 +00:00
Matthew Hodgson
0250192477
handle tagging for kicked rooms correctly
2016-03-18 19:59:58 +00:00
Matthew Hodgson
bfbb7a661e
special case to include kicked rooms as per https://github.com/vector-im/vector-web/issues/308
2016-03-18 19:45:04 +00:00
Matthew Hodgson
24972a8267
if we're not peeking in a room, stop any ongoing peeking
2016-03-18 19:23:30 +00:00
Matthew Hodgson
86807b631d
don't reset RoomHeader every time the props change due to RoomView re-rendering during edits
2016-03-18 19:16:55 +00:00
Matthew Hodgson
12db0d9130
fix NPE on events with no sender object
2016-03-18 16:33:22 +00:00
Matthew Hodgson
d0ecd38927
top-align search results
2016-03-18 16:25:11 +00:00
Richard van der Hoff
15c9ad87a1
Merge pull request #231 from matrix-org/rav/pending_event_list
...
Use new pendingEventList functionality from matrix-js-sdk
2016-03-18 16:17:56 +00:00
David Baker
03de19cd27
Merge pull request #233 from matrix-org/dbkr/show_invited_email
...
Display a warning if a third party invite for a room was sent to an address that is not bound publicly to our account
2016-03-18 16:08:27 +00:00
David Baker
076bd720a3
Spell address correctly
2016-03-18 16:07:32 +00:00
David Baker
eb5aa7ed7d
Move comment
2016-03-18 16:06:36 +00:00
Richard van der Hoff
cb1cf0661e
Bump to latest react-gemini-scrollbar build
...
Hopefully this will https://github.com/vector-im/vector-web/issues/1186 and
some other bugs.
2016-03-18 16:06:12 +00:00
David Baker
b4dd7ba509
I mean string, object
2016-03-18 16:04:58 +00:00
David Baker
3e915cf0e2
Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email
2016-03-18 15:34:15 +00:00