mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 10:01:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
11495 commits 219 branches 562 tags 474 MiB
Commit graph

11495 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
9593e8c4fd Merge remote-tracking branch 'origin/develop' into develop 2018-07-27 13:51:34 +00:00
David Baker
148308235d
Merge pull request #2092 from matrix-org/dbkr/reposition_jitsi 
Fix persistent element location not updating
 2018-07-27 14:51:29 +01:00
David Baker
1c0f778e82 Fix persistend element location not updating 
As hopefully all explained in comment
 2018-07-27 14:42:58 +01:00
David Baker
1fe0f04986 Fix persistend element location not updating 
As hopefully all explained in comment
 2018-07-27 14:33:05 +01:00
Weblate
c62562eb59 Merge remote-tracking branch 'origin/develop' into develop 2018-07-27 13:01:01 +00:00
Kyf Lee
1e9f2f112d Translated using Weblate (Korean) 
Currently translated at 96.7% (1179 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2018-07-27 13:01:00 +00:00
David Baker
b6ebb0cc37
Merge pull request #2089 from matrix-org/t3chguy/slate_cont2 
Slate Fixes 42?
 2018-07-27 14:00:53 +01:00
Weblate
5cc559cae3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-26 21:28:13 +00:00
Kyf Lee
137c5068b0 Translated using Weblate (Korean) 
Currently translated at 96.7% (1179 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2018-07-26 21:28:13 +00:00
Michael Telatynski
6093f0ca68
Merge pull request #2090 from matrix-org/t3chguy/devtools_focus 
fix Devtools input autofocus && state traversal when len === 1 && key=""
 2018-07-26 22:28:07 +01:00
Michael Telatynski
0174f67fe7
fix Devtools input autofocus && state traversal when len === 1 && key="" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-26 18:20:09 +01:00
Michael Telatynski
f264075369
null-guard history properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-26 17:11:32 +01: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
Michael Telatynski
265e4267b8
remove faulty onBlur/onFocus code which caused selection to rollback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-26 15:00:43 +01: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
c6ad30ff85 v0.13.0-rc.2 2018-07-24 19:34:37 +01:00
David Baker
97fd605440 Prepare changelog for v0.13.0-rc.2 2018-07-24 19:34:36 +01:00
David Baker
c35dec93e5 Merge remote-tracking branch 'origin/develop' into release-v0.13.0 2018-07-24 19:30:26 +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
15c3d4ed16 v0.13.0-rc.1 2018-07-24 18:31:28 +01:00
David Baker
ca35ef3fa5 Prepare changelog for v0.13.0-rc.1 2018-07-24 18:31:28 +01:00
David Baker
7891681920 js-sdk rc.1 2018-07-24 18:27:30 +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