mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
28918 commits 214 branches 561 tags 415 MiB
Commit graph

28918 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
RiotRobot
d007b06d7c Reset matrix-js-sdk back to develop branch 2020-10-12 13:40:23 +01:00
RiotRobot
ddd3d97b71 Merge branch 'master' into develop 2020-10-12 13:39:18 +01:00
RiotRobot
2242e6b8c6 v3.6.0 2020-10-12 13:36:52 +01:00
RiotRobot
71e800abd1 Prepare changelog for v3.6.0 2020-10-12 13:36:52 +01:00
RiotRobot
0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
J. Ryan Stinnett
26e63c23b6
Merge pull request #5307 from matrix-org/jryans/sso-4s-integration 
Convert `src/SecurityManager.js` to TypeScript
 2020-10-12 11:41:12 +01:00
David Baker
414901dfae More enums 2020-10-12 11:38:32 +01:00
J. Ryan Stinnett
6498f3fcef Simplify types 2020-10-12 11:11:39 +01:00
David Baker
abd5e3b3cf More enums 2020-10-12 10:25:23 +01:00
David Baker
3af7abb5fe This comment is no longer true 2020-10-12 09:56:43 +01:00
David Baker
94802036d9 AudioId -> AudioID 2020-10-12 09:55:21 +01:00
ginnyTheCat
046f498295
Added formula sources 2020-10-11 00:37:00 +02:00
RinkiyaKeDad
f5a40eff4b updated TagFilterStore 2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30