Commit Graph

28845 Commits (447ea9eb2332f1d3b675d18bd8db1658d3cb8aa1)

Author SHA1 Message Date
Michael Telatynski 447ea9eb23 Relax flexboxes in resizer on window resize
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:11:58 +01:00
Michael Telatynski ba21c6ed36 Iterate on Widget icons and resizing handles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 15:56:53 +01:00
Michael Telatynski a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/components/structures/RoomView.tsx
2020-10-13 13:45:22 +01:00
Michael Telatynski 7be5ff0fe6 First cut of app drawer tiled resizing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:29:12 +01:00
Michael Telatynski 1a45d18b94 Iterate the resizer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:28:23 +01:00
Michael Telatynski f72b1e0c7d Remove stale things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:27:50 +01: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
Michael Telatynski afacf8c6b7 Improve LHS resize performance
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 10:30:52 +01:00
David Baker ed9584bbac Comment scoping block 2020-10-13 09:55:03 +01:00
Michael Telatynski 340e79179e Convert Resizer to Typescript and create a Percentage based sizer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 16:47:04 +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
Michael Telatynski c1fef5a941 Improve the styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:36:09 +01:00
RiotRobot 0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
Michael Telatynski 7820f9c28a Switch to WidgetAvatar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:16:55 +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
Michael Telatynski 37558f1f0d Improve the context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 09:51:49 +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
Michael Telatynski b2dc5542b3 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 09:00:38 +01:00
Michael Telatynski 85aca420f4 sort hasPinnedWidgets out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:52:34 +01:00
Michael Telatynski 317dc68135 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-09 08:45:11 +01:00
Michael Telatynski ada6d1aa46 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01: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 b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +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