Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,924 Commits 206 Branches 552 Tags 519 MiB
5caad82f9f
Commit Graph

28924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
7cce8a3196
Merge pull request #5321 from matrix-org/travis/fix-line 
Fix/clarify boolean logic for reaction previews
 2020-10-14 10:08:41 -06:00
Travis Ralston
dccea97762 Fix/clarify boolean logic for reaction previews 2020-10-14 08:56:08 -06:00
Arsh Sharma
a5d01f2f4d missed a replacement 2020-10-14 17:18:50 +05:30
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
7e4b32c0d2 fixing i18 error 2020-10-14 16:44:58 +05:30
Michael Telatynski
efad42439e Fix background-image: url(null) for backdrop filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 11:41:24 +01:00
Arsh Sharma
f705796477 fixing errors 2020-10-14 16:04:41 +05:30
David Baker
f60dff5f0c
Merge pull request #5311 from matrix-org/dbkr/its_glare 
Support glare for VoIP calls
 2020-10-14 11:20:25 +01:00
Michael Telatynski
12be6c34da
Merge pull request #5314 from matrix-org/t3chguy/ts/3 
Round of Typescript conversions
 2020-10-14 11:15:30 +01:00
Michael Telatynski
00e35dafb3 Fix aspect ratio of avatar before clicking Save 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:57:34 +01:00
Michael Telatynski
b7a1e698df fix tests which use a private method 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:47:46 +01:00
Michael Telatynski
2ea2068d95 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/3 2020-10-14 10:43:38 +01:00
Michael Telatynski
dce047e25c
Merge pull request #5317 from matrix-org/t3chguy/fix/11510 
Fix broken rendering of Room Create when showHiddenEvents enabled
 2020-10-14 10:27:18 +01:00
Michael Telatynski
e3155fe58f
Merge pull request #5313 from matrix-org/t3chguy/other/1 
Improve LHS resize performance and tidy stale props&classes
 2020-10-14 10:06:37 +01:00
Michael Telatynski
3faf28f996 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/11510 2020-10-14 10:00:27 +01:00
Michael Telatynski
38bf7b3055 Apply the fix more generically 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 09:46:54 +01:00
Michael Telatynski
910bdf0802 Fix broken rendering of Room Create when showHiddenEvents enabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 09:38:45 +01:00
Damir Jelić
f3958e43e7 Merge remote-tracking branch 'origin/poljar/seshat-keytar' into develop 2020-10-14 09:56:16 +02:00
Michael Telatynski
e885d9cb0d TS improvements 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 22:58:21 +01:00
Travis Ralston
161dc0b6c6 Add i18n 2020-10-13 15:11:48 -06:00
Travis Ralston
f9029cd224 Make the ACL update message less noisy 
Fixes https://github.com/vector-im/element-web/issues/14216

Copy is not reviewed as of writing.
 2020-10-13 15:08:04 -06:00
Travis Ralston
4ae6507195
Merge pull request #5315 from matrix-org/travis/widgets/fix-jitsi 
Fix various aspects of (jitsi) widgets
 2020-10-13 15:07:51 -06:00
Travis Ralston
f9ac390842 Appease the linter 2020-10-13 14:56:27 -06:00
Travis Ralston
294c35347c Ensure widgets are destroyed cleanly when minimized 
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)

Also fixes other issues relating to widgets not loading when being minimized/maximized.
 2020-10-13 14:55:44 -06:00
Travis Ralston
40038a6100 Run templating on the popout URL too 
Fixes https://github.com/vector-im/element-web/issues/15443
 2020-10-13 14:54:02 -06:00
Michael Telatynski
20cc3911ed switch form global to window 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 18:48:02 +01:00
Michael Telatynski
cace3fd8aa TS conversion exports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:40:34 +01:00
Michael Telatynski
5a2eda260d Convert DateUtils to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:39:58 +01:00
Michael Telatynski
9396f98f2b Convert email to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:39:38 +01:00
Michael Telatynski
9cfc075d68 Convert Presence to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:39:29 +01:00
Michael Telatynski
a94c899c0a Convert Roles to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:39:13 +01:00
Michael Telatynski
dd8cac307c Convert shouldHideEvent to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:38:59 +01:00
Michael Telatynski
ee4f75cb6e Convert UserActivity to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:38:49 +01:00
Michael Telatynski
1a4a866820 Convert Avatar to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:38:33 +01:00
Michael Telatynski
f26a842ff3 Convert WhoIsTyping to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:37:06 +01:00
Michael Telatynski
8e401cff05 Convert Analytics to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:36:50 +01:00
Michael Telatynski
17ed333beb Replace extend with Object.assign 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 17:36:40 +01:00
Arsh Sharma
4baf3b8deb error fix in PreferencesUserSettingsTab.js 2020-10-13 21:26:08 +05:30
Arsh Sharma
3bdb6606de fix(LeftPanel.tsx): fix 2 for linting errors 2020-10-13 21:07:18 +05:30
Arsh Sharma
fa88eea274 fix(LeftPanel.tsx): fix for linting errors 2020-10-13 20:56:28 +05:30
Michael Telatynski
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
Michael Telatynski
a2b61796af Improve LHS resize performance 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:20:54 +01:00
Damir Jelić
860b1b46e0 event-index: Use camel case for the user/device id. 2020-10-13 17:03:58 +02:00
Damir Jelić
5989a21dfb event-index: Pass the user/device id pair when initializing the event index. 2020-10-13 16:34:25 +02:00
David Baker
54babddb38 Support glare for VoIP calls 
The js-sdk supports glare but we didn't support it, which means the
js-sdk will still do glare but we didn't know about it, leaving the
UI in horribly broken states where the js-sdk would be on a call but
the app didn't think it was.

Fixes https://github.com/vector-im/element-web/issues/5770
 2020-10-13 15:08:23 +01:00
Arsh Sharma
357579d6ba fixed errors in leftpanel.tsx 2020-10-13 17:04:39 +05:30
David Baker
4425ae30e9
Merge pull request #5310 from matrix-org/dbkr/fix_rogue_half_call_bar 
Fix rogue (partial) call bar
 2020-10-13 12:24:10 +01:00
David Baker
4c11a82fef Fix rogue (partial) call bar 
Call state is now null if there is no call, so check for that too
 2020-10-13 12:16:15 +01:00
David Baker
40ba342aa2
Merge pull request #5308 from matrix-org/dbkr/call_state_machine 
Rewrite call state machine
 2020-10-13 10:39:15 +01:00
David Baker
ed9584bbac Comment scoping block 2020-10-13 09:55:03 +01:00