Michael Telatynski
|
a5468c918e
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
Conflicts:
src/resizer/distributors/collapse.ts
src/resizer/distributors/fixed.ts
src/resizer/index.ts
src/resizer/item.ts
src/resizer/resizer.ts
src/resizer/sizer.ts
|
2020-10-21 09:56:22 +01:00 |
|
Michael Telatynski
|
5a9bac68c6
|
iterate PR based on feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-21 09:48:02 +01:00 |
|
Michael Telatynski
|
9cd146aa33
|
remove debug lines
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-21 09:46:37 +01:00 |
|
Michael Telatynski
|
42228719b9
|
Merge pull request #5343 from matrix-org/t3chguy/ts/resizer
Convert resizer to Typescript
|
2020-10-20 23:54:17 +01:00 |
|
Michael Telatynski
|
01498653d8
|
update copyrights
|
2020-10-20 23:42:12 +01:00 |
|
Michael Telatynski
|
9348c8a23b
|
Fix some widget auto tiling issues
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-20 16:07:47 +01:00 |
|
Michael Telatynski
|
2b9c2daaf4
|
Fix auto-pinned widget ordering
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-20 16:07:21 +01:00 |
|
Michael Telatynski
|
334ab12c47
|
Tidy up widget colouring
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-20 16:06:35 +01:00 |
|
Michael Telatynski
|
9181e3e89a
|
Merge pull request #5338 from matrix-org/t3chguy/fix/15166
Hide filtering microcopy when left panel is minimized
|
2020-10-20 15:21:43 +01:00 |
|
J. Ryan Stinnett
|
350c536cc7
|
Merge pull request #5344 from matrix-org/jryans/release-disable-editor
Skip editor confirmation of upgrades
|
2020-10-20 15:11:13 +01:00 |
|
J. Ryan Stinnett
|
31cc3765e3
|
Skip editor confirmation of upgrades
In practice, the upgrades are always fine, and this editor prompt just adds
delays.
|
2020-10-20 11:55:48 +01:00 |
|
Michael Telatynski
|
5caad82f9f
|
Merge pull request #5337 from matrix-org/t3chguy/fix/15484
Spec compliance, /search doesn't have to return results
|
2020-10-20 11:36:37 +01:00 |
|
Michael Telatynski
|
7752f92533
|
Merge pull request #5336 from matrix-org/t3chguy/fix/15488
Fix excessive hosting link padding
|
2020-10-20 11:29:13 +01:00 |
|
RiotRobot
|
bd1276c56b
|
Reset matrix-js-sdk back to develop branch
|
2020-10-20 11:27:33 +01:00 |
|
RiotRobot
|
2d5528fccd
|
Merge branch 'master' into develop
|
2020-10-20 11:26:23 +01:00 |
|
RiotRobot
|
3b90ed0664
|
v3.6.1
|
2020-10-20 11:23:48 +01:00 |
|
RiotRobot
|
10fbdef6d6
|
Prepare changelog for v3.6.1
|
2020-10-20 11:23:48 +01:00 |
|
Michael Telatynski
|
329ded92c1
|
Convert resizer to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-20 11:03:03 +01:00 |
|
Michael Telatynski
|
5fcdaf66cc
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
|
2020-10-19 18:50:02 +01:00 |
|
Michael Telatynski
|
4184923e5e
|
fix default widget icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 18:49:56 +01:00 |
|
Michael Telatynski
|
1fe2eea43f
|
Pass theme to Jitsi
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 18:47:27 +01:00 |
|
Michael Telatynski
|
06009df05b
|
Update Widget paddings and background colours
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 18:47:15 +01:00 |
|
J. Ryan Stinnett
|
bdd6287fcc
|
Merge pull request #5342 from matrix-org/jryans/event-lib-release
[Release] Adjust for new widget messaging APIs
|
2020-10-19 17:53:29 +01:00 |
|
J. Ryan Stinnett
|
2219419f52
|
Upgrade widget API
|
2020-10-19 17:41:04 +01:00 |
|
J. Ryan Stinnett
|
11199f89f4
|
Adjust for new widget messaging APIs
As part of changing to the `events` package, the API surface changed slightly.
Related to https://github.com/vector-im/element-web/issues/15493
|
2020-10-19 17:38:28 +01:00 |
|
J. Ryan Stinnett
|
59871263ab
|
Merge pull request #5341 from matrix-org/jryans/event-lib
Adjust for new widget messaging APIs
|
2020-10-19 17:31:00 +01:00 |
|
J. Ryan Stinnett
|
d6a166d3bf
|
Upgrade widget API
|
2020-10-19 16:56:36 +01:00 |
|
J. Ryan Stinnett
|
7fe98b4e9d
|
Adjust for new widget messaging APIs
As part of changing to the `events` package, the API surface changed slightly.
Related to https://github.com/vector-im/element-web/issues/15493
|
2020-10-19 16:42:20 +01:00 |
|
Michael Telatynski
|
bbb11a76bc
|
Merge pull request #5339 from matrix-org/t3chguy/fix/15491
Fix case where sublist context menu missed an update
|
2020-10-19 15:52:18 +01:00 |
|
David Baker
|
ce47856b72
|
Merge pull request #5340 from matrix-org/dbkr/voip_analytics
Add analytics to VoIP
|
2020-10-19 15:15:30 +01:00 |
|
David Baker
|
88b7210f5c
|
consistent quotes
|
2020-10-19 15:04:57 +01:00 |
|
David Baker
|
45d639d963
|
Add analytics to VoIP
|
2020-10-19 14:56:15 +01:00 |
|
Michael Telatynski
|
fefd374a32
|
Fix case where sublist context menu missed an update
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 14:34:47 +01:00 |
|
Michael Telatynski
|
744a4abd1c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
|
2020-10-19 13:08:17 +01:00 |
|
Michael Telatynski
|
73489b7c6d
|
AppsDrawer watch ResizeNotifier isResizing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 13:08:11 +01:00 |
|
Michael Telatynski
|
47744a4344
|
Hide filtering microcopy when left panel is minimized
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 12:55:01 +01:00 |
|
Michael Telatynski
|
35d12171b1
|
Remove unused prop for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 12:54:53 +01:00 |
|
Michael Telatynski
|
9789f8cf94
|
Spec compliance, /search doesn't have to return results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 12:46:55 +01:00 |
|
Michael Telatynski
|
30adc98a15
|
Fix excessive hosting link padding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 12:34:25 +01:00 |
|
Michael Telatynski
|
b23fbde306
|
Merge pull request #5335 from matrix-org/t3chguy/cherry-pick/jitsi-openidc
[Release] Fix Jitsi OpenIDC auth
|
2020-10-19 11:23:01 +01:00 |
|
Michael Telatynski
|
92f89b8dca
|
Merge pull request #5334 from matrix-org/t3chguy/fix/jitsi-openidc
Fix Jitsi OpenIDC auth
|
2020-10-19 11:11:17 +01:00 |
|
Michael Telatynski
|
596c723dea
|
Fix Jitsi OpenIDC auth
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 11:10:39 +01:00 |
|
Michael Telatynski
|
81990d36b5
|
Fix Jitsi OpenIDC auth
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-19 10:49:07 +01:00 |
|
David Baker
|
b10f7a47fd
|
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups
Support rejecting calls
|
2020-10-19 09:57:13 +01:00 |
|
Travis Ralston
|
d5e9d5306a
|
Merge pull request #5330 from matrix-org/travis/fix-user-info
Don't show admin tooling if we're not in the room
|
2020-10-16 15:04:06 -06:00 |
|
Travis Ralston
|
5f3f7b5263
|
Don't show admin tooling if we're not in the room
Fixes https://github.com/vector-im/element-web/issues/15480
|
2020-10-16 13:43:08 -06:00 |
|
David Baker
|
4a26199a75
|
use real equals
Co-authored-by: Travis Ralston <travpc@gmail.com>
|
2020-10-16 20:28:20 +01:00 |
|
Travis Ralston
|
aa28459b5a
|
Don't supply popout widgets with widget parameters
Fixes https://github.com/vector-im/element-web/issues/15443
|
2020-10-16 13:03:08 -06:00 |
|
Travis Ralston
|
7ef4de3115
|
Appease the linter
|
2020-10-16 13:02:50 -06:00 |
|
Travis Ralston
|
f2c874ccb6
|
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-16 13:02:42 -06:00 |
|