bf7633250a
Revert "Fix showing peek preview while LL members are loading"
2018-08-22 16:16:17 +01:00
a54629276f
use getJoinedMemberCount() instead of getJoinedMembers().length as the latter doesnt take LL into account
2018-08-22 14:08:18 +02:00
c38b286e8e
falsy check is obsolete now
2018-08-22 12:28:00 +02:00
01a0260ac8
use getMyMembership instead of member
2018-08-22 10:33:13 +02:00
1009bc43ae
call method on room now to LL members
2018-08-07 14:47:06 +02:00
b151956f7b
Use room method to help with DM detection with fallback to summary heroes/counts.
2018-08-02 11:42:19 +02:00
908de56c6d
replace getMember(myId).membership with getMyMembership
...
This works with rooms which haven't had their members
loaded yet.
2018-08-02 11:42:05 +02:00
33f5560666
move error message to caller of lazy loading
2018-07-25 16:10:49 +02:00
201332d96c
move comment after rebase
2018-07-25 16:10:49 +02:00
af07d73432
hide lazy loading behind feature flag
2018-07-25 16:10:49 +02:00
e237a02fa5
use more consistent naming
2018-07-25 16:10:49 +02:00
6ff92ede8f
this code actually never fires, so remove it
...
and that's ok because createRoom will already mark a DM as such
on the inviter's side. So here we just handle the invitees side.
2018-07-25 16:10:49 +02:00
19387805ac
Don't assume RoomMember has a state event in direct chat detection
...
Instead call the method on the member that takes lazy loading into account
2018-07-25 16:10:49 +02:00
de3e143a8f
only lazy load the members when viewing a joined room
2018-07-25 16:10:49 +02:00
7aab6fa6f1
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-18 09:35:57 +01:00
b412b9e84d
Fix stopPeeking not being called at the right time
...
stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.
The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.
This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
2018-07-12 15:19:25 +02:00
b6f854abe4
Simplify event name as it's the only one
2018-07-05 20:00:42 +01:00
eb552e5cef
Just pass the roomId into WidgetEchoStore
2018-07-05 18:43:20 +01:00
8b64ddcbe8
Do some level of local echo for widgets
...
* Show a spinner while we wait for widgets to be deleted
* Hide widgets while they're pending deletion
* Don't put another jitsi widget into the room if there's already
one pending
2018-07-03 11:16:44 +01:00
9539a749e5
More refactoring
2018-06-26 16:03:58 +01:00
553111b6e2
Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee
...
default to not showing url previews in e2ee rooms.
2018-06-25 11:50:14 +01:00
b7396c8ef0
trigger urlPreviews state update on {,room}AccountData changes of settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-22 19:17:55 +01:00
acbc84a69c
switch to another settings key for e2e url previews to protect on change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-22 18:44:54 +01:00
ed1f801254
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-22 18:36:07 +01:00
a45dc837b4
add copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-22 18:36:01 +01:00
891070d001
update UrlPreview settings to be more privacy-aware in e2ee rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-22 18:35:54 +01:00
6200c147a6
Upload File confirmation modal steals focus, send it back to composer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-19 08:41:24 +01:00
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
...
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-07 22:01:27 +01:00
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open
2018-06-06 09:17:08 -06:00
da9fe9917b
Fix click on faded left/right/middle panel -> close settings
...
- implement generic dispatch to close user/room/group settings
- use dispatch to allow clicks on disabled left/right/middle panel to
close settings
A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
752605429c
Persist pinned message open-ness between room switches
...
Addresses part of https://github.com/vector-im/riot-web/issues/5405
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-05-26 19:58:12 -06:00
4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-05-02 13:14:47 +01:00
db55f87699
avoid .done and .then anti-pattern
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-05-01 18:14:35 +01:00
bbf4d3e39f
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-04-29 00:34:27 +01:00
82d117974f
Remove unused import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-04-27 11:16:29 +01:00
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/components/structures/RoomView.js
2018-04-04 11:08:34 +01:00
35fcb2c9ab
Catch rather than 'done' error handler.
2018-03-29 16:56:02 +01:00
23a52bdb4c
Indentation.
2018-03-29 16:46:22 +01:00
b5ed08eba2
Merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-03-24 17:52:49 +00:00
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
f08ec3498a
Fix bug that prevented tint updates
2018-02-22 10:53:06 +00:00
665ddccb0d
restrict to m.text for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-02-20 15:45:25 +00:00
90f9badbf3
s/Reply/ReplyThread/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-02-20 15:40:19 +00:00
bc15303358
Factor out updateDmState
2018-02-20 14:10:34 +00:00
d21f55633d
Fix DMs being marked as with the current user ("me")
...
Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.
This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)
The two cases for setting a DM are:
- this user accepting an invite with is_direct
- this user inviting someone with is_direct
This should handle all cases for setting DM state.
2018-02-20 14:03:43 +00:00
7048d85246
attach message_sent and replies to file uploads
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-02-19 23:42:04 +00:00
55593416fa
Hide apps drawer when viewining room settings.
2018-02-09 13:23:34 +00:00
5823b32ab1
RoomView: guard against unmounting during peeking
...
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
2018-02-08 10:01:24 +00:00
8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar
...
Hide status bar on visible->hidden transition
2018-01-05 15:26:22 +00:00
