PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
28838 commits 1 branch 0 tags 338 MiB
Commit graph

28838 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
J. Ryan Stinnett
2698a12a6f Convert src/SecurityManager.js to TypeScript 
This includes a few small API tweaks as well, only in cases where TS revealed we
were doing something confusing or wrong.

Part of https://github.com/vector-im/element-web/issues/15350
 2020-10-09 17:27:03 +01:00
Travis Ralston
34a0757a4c
Merge pull request #5306 from matrix-org/travis/rel/5305 
[Release] Fix templating for v1 jitsi widgets
 2020-10-09 09:34:46 -06:00
Travis Ralston
0c6ac113f4
Merge pull request #5305 from matrix-org/travis/widgets/broken-jitsi 
Fix templating for v1 jitsi widgets
 2020-10-09 09:32:42 -06:00
Travis Ralston
3e7f117611 Fix templating for v1 jitsi widgets 
Fixes https://github.com/vector-im/element-web/issues/15427
 2020-10-09 09:31:02 -06:00
Travis Ralston
1af8d96db9 Fix templating for v1 jitsi widgets 
Fixes https://github.com/vector-im/element-web/issues/15427
 2020-10-09 09:26:52 -06:00
Travis Ralston
f528a161ad
Merge pull request #5304 from matrix-org/travis/rel/5303 
[Release] Use new preparing event for widget communications
 2020-10-09 08:56:24 -06:00
Travis Ralston
2caf679024 Update widget-api 2020-10-08 21:22:17 -06:00
Travis Ralston
fcc411f8b9 Use new preparing event for widget communications 
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
 2020-10-08 21:21:53 -06:00
Travis Ralston
e92af6cb73
Merge pull request #5303 from matrix-org/travis/fix-widget-comms 
Use new preparing event for widget communications
 2020-10-08 21:21:31 -06:00
Travis Ralston
25db3e9efa Update widget-api 2020-10-08 21:21:11 -06:00
Travis Ralston
d38b544a42 Use new preparing event for widget communications 
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
 2020-10-08 15:35:22 -06:00
Travis Ralston
bce0204eb6
Merge pull request #5302 from matrix-org/travis/fix-preview 
Fix parsing issue in event tile preview for appearance tab
 2020-10-08 15:03:43 -06:00
Travis Ralston
2cd431db1c Appease the linter 2020-10-08 14:50:17 -06:00
Travis Ralston
d5b264b7a0 Fix parsing issue in event tile preview for appearance tab 
Fixes https://github.com/vector-im/element-web/issues/15419
 2020-10-08 14:21:39 -06:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353 
Track replyToEvent along with Cider state & history
 2020-10-08 14:59:14 +01:00
Michael Telatynski
513eb034cc
Merge pull request #5299 from matrix-org/t3chguy/fix/15408 
Roving Tab Index should not interfere with inputs
 2020-10-08 14:50:48 +01:00
Michael Telatynski
841abc21e1 Roving Tab Index should not interfere with inputs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 10:25:03 +01:00
J. Ryan Stinnett
0466f1df76
Merge pull request #5298 from matrix-org/jryans/2020-10-polishing 
Visual tweaks from 2020-10-06 polishing
 2020-10-08 10:15:04 +01:00
Michael Telatynski
b2d04deb83 fix tests for the new sessionStorage key 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 10:04:01 +01:00