Bruno Windels
b9bbb7ee16
pass in userId with room in test
2018-08-02 11:40:56 +02:00
Bruno Windels
0dd860242a
Merge pull request #2072 from matrix-org/bwindels/lazy_load_members
...
Lazy load room members - Part I
2018-07-26 17:19:12 +02:00
Bruno Windels
cfd20c7e85
fix error/tests
2018-07-25 16:10:49 +02:00
Bruno Windels
d87d34030a
fix dm detection and conf call code with lazy loading
2018-07-25 16:10:49 +02:00
Bruno Windels
7ea913ccec
fall back to synced membership when own membership is not yet available (due to lazy loading)
2018-07-25 16:10:49 +02:00
Bruno Windels
f79e2eae40
might not have loaded members here yet
2018-07-25 16:10:49 +02:00
Bruno Windels
33f5560666
move error message to caller of lazy loading
2018-07-25 16:10:49 +02:00
Bruno Windels
34cb89e86a
fix tests
2018-07-25 16:10:49 +02:00
Bruno Windels
201332d96c
move comment after rebase
2018-07-25 16:10:49 +02:00
Bruno Windels
af07d73432
hide lazy loading behind feature flag
2018-07-25 16:10:49 +02:00
Bruno Windels
866b4bb067
use isKicked method in preview bar
2018-07-25 16:10:49 +02:00
Bruno Windels
8c9ceca14f
take into account lazy loading when enlarging avatar
2018-07-25 16:10:49 +02:00
Bruno Windels
af77f0206a
don't assume a member has events associated
2018-07-25 16:10:49 +02:00
Bruno Windels
8529bc55e3
use helper method for knowing whether a user was kicked
...
mainly for readability, but also to discourage grabbing into the member
because of lazy loading changes
2018-07-25 16:10:49 +02:00
Bruno Windels
e237a02fa5
use more consistent naming
2018-07-25 16:10:49 +02:00
Bruno Windels
54904c9282
use member helper method instead of digging inside member
2018-07-25 16:10:49 +02:00
Bruno Windels
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
Bruno Windels
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
Bruno Windels
de3e143a8f
only lazy load the members when viewing a joined room
2018-07-25 16:10:49 +02:00
Bruno Windels
8c985bd049
ask client to lazy load room members when viewing a room
2018-07-25 16:10:49 +02:00
Luke Barnard
a11e1cc2f9
[WIP] Send lazy_load_memberers filter when syncing
2018-07-25 16:10:49 +02:00
David Baker
a00c2b753a
Merge pull request #2085 from matrix-org/t3chguy/emoji_aliases
...
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
2018-07-25 10:40:59 +01:00
David Baker
0c1722c8ee
Update package-lock deps
2018-07-24 22:07:12 +01:00
David Baker
3c377c1816
Merge pull request #2087 from matrix-org/dbkr/jitsi_out_of_labs
...
Take jitsi conf calling out of labs
2018-07-24 19:22:44 +01:00
David Baker
20ea86417e
Appease the linter
2018-07-24 19:14:44 +01:00
David Baker
d8be4508e8
Unused import
2018-07-24 19:13:05 +01:00
David Baker
cfa7d0f11d
Take jitsi conf calling out of labs
2018-07-24 19:06:19 +01:00
David Baker
ffabd60972
Merge pull request #2086 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-07-24 18:26:42 +01:00
Weblate
86eaf2bd6a
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:34:24 +00:00
David Baker
cf6ce0c1e2
Merge pull request #2082 from matrix-org/t3chguy/slate_cont2
...
Moar Slate Fixes
2018-07-24 17:34:20 +01:00
Weblate
b2fce4809f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:12:54 +00:00
David Baker
c19a5bd2a8
Merge pull request #2084 from matrix-org/dbkr/store_destroy_persistent_widget
...
Make ActiveWidgetStore clear persistent widgets
2018-07-24 17:12:49 +01:00
Michael Telatynski
07f0713a56
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 17:06:45 +01:00
David Baker
cdd73e6e1f
Check matrix client exists when stopping
2018-07-24 16:55:45 +01:00
David Baker
7044410a13
Move destroyPersistentWidget to store
2018-07-24 16:50:34 +01:00
David Baker
acc767a479
s/start/stop/
2018-07-24 16:39:30 +01:00
David Baker
ec4c7ffb71
Make ActiveWidgetStore clear persistent widgets
...
ActiveWidgetStore is now reponsible for removing the current
persistent widget from the store if it's been removed from whatever
room it was in. As per comment, this leaves us with the store updating
itself in this case but in all other cases, views call setters on the
store to update its state. We should make it so the store keeps itself
up to date and views aren't responsible for keeping the store up to date.
The store now emits events so it can notify PersistentApp when it changes.
Fixes https://github.com/vector-im/riot-web/issues/7076
2018-07-24 16:21:43 +01:00
Weblate
7e721adf80
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 15:03:32 +00:00
Michael Telatynski
fe3850d61f
Merge pull request #2078 from psaavedra/fix_render_in_CreateRoomDialog
...
CreateRoomDialog is rendered before getting the config default_federate
2018-07-24 16:03:26 +01:00
Michael Telatynski
020e714b85
fix focus and too many <p>s after a Event>Quote in RT mode
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 15:54:24 +01:00
Michael Telatynski
6a0182a653
update Slate as fixes have now landed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 15:53:48 +01:00
Michael Telatynski
6cd3860058
fix conjugated emoji in slate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 14:35:23 +01:00
Michael Telatynski
afa19cd60d
make clicking autocomplete suggestions work again
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 13:48:05 +01:00
Michael Telatynski
ef39327073
fix CommandMap typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 13:21:36 +01:00
Michael Telatynski
7c3873b449
fix @room
pill href=undefined and @room parsing breaking subsequent pills
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 12:18:10 +01:00
Weblate
3eb832aa2f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 16:25:55 +00:00
David Baker
b8ca65627b
Merge pull request #2076 from matrix-org/t3chguy/slate_cont2
...
Slate Fixes
2018-07-23 17:25:51 +01:00
Weblate
d5093b7ba0
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 16:24:45 +00:00
David Baker
d242935a90
Merge pull request #2077 from matrix-org/bwindels/fix-dm-error-on-left-room
...
FIX: Don't error on rooms the user has left already
2018-07-23 17:24:41 +01:00
David Baker
6804647dda
Destroy widget when its permission is revoked
2018-07-23 17:11:53 +01:00