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

28008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
5c878ddfdd
Merge pull request #5172 from matrix-org/travis/widgets/msc1960-1 
Update openid_credentials Widget API action for MSC1960 updates
 2020-09-08 07:20:35 -06:00
Michael Telatynski
ddba5c6223
Merge pull request #5138 from matrix-org/t3chguy/dpsah/6785 
Allow persistent resizing of the widget app drawer
 2020-09-08 09:47:11 +01:00
Michael Telatynski
667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
 2020-09-07 14:33:57 +01:00
Michael Telatynski
80b22d1f82
Merge pull request #5158 from dkanada/patch-1 
add lenny face command
 2020-09-07 14:28:40 +01:00
Travis Ralston
db1eb89552 MSC numbers are hard to remember 2020-09-05 15:10:28 -06:00
Travis Ralston
355d8f5843 Update openid_credentials Widget API action for MSC1960 updates 
We now need to send a `state` and `original_request_id` per MSC1960's recent adjustments
 2020-09-05 15:06:31 -06:00
J. Ryan Stinnett
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup 
Prep work for Settings changes with cross-signing deferral
 2020-09-04 12:51:25 +01:00
Michael Telatynski
a713c9763b
Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2 
Small code clean ups and tweaks
 2020-09-04 12:25:46 +01:00
Michael Telatynski
f28c396b1e Fix HeaderButtons handler bindings 2020-09-04 12:14:43 +01:00
Michael Telatynski
4b748b41ca
Merge pull request #5170 from matrix-org/t3chguy/fix/15091 
Fix soft crash from TruncatedList in the createReactClass conversion
 2020-09-04 09:46:00 +01:00
Michael Telatynski
6d811734f4 Fix soft crash from TruncatedList in the createReactClass conversion 2020-09-04 09:24:12 +01:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1 
Remove create-react-class
 2020-09-03 17:21:58 +01:00
Michael Telatynski
05c3f5c381 remove redundant key 2020-09-03 17:05:33 +01:00
J. Ryan Stinnett
4ef3ef40db Change to import 2020-09-03 16:47:56 +01:00
Michael Telatynski
bdfb77077a Fix RightPanel propTypes 2020-09-03 16:08:10 +01:00
Michael Telatynski
368571bcff Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.2 2020-09-03 16:07:37 +01:00
Michael Telatynski
97ebfa02c3
Merge pull request #5162 from matrix-org/t3chguy/lodash 
Consolidate Lodash files in bundle
 2020-09-03 15:54:43 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers 
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
 2020-09-03 15:41:17 +01:00
Michael Telatynski
280690cf3c use useIsEncrypted hook in UserInfo 2020-09-03 15:07:10 +01:00
Michael Telatynski
3a8499259e factor out the useIsEncrypted hook 2020-09-03 15:06:41 +01:00
Michael Telatynski
6d4de4d22b tidy up ScrollPanel comments 2020-09-03 15:05:35 +01:00
Michael Telatynski
ad9be61477 Move HeaderButtons to an abstract class 2020-09-03 15:05:24 +01:00
Michael Telatynski
c7e40d0751 Fix MemberAvatar props interface 2020-09-03 15:05:10 +01:00
Michael Telatynski
8b4250c142 expose RightPanelStore in window 2020-09-03 15:04:49 +01:00
Michael Telatynski
1479690ac4 RightPanel use room instead of roomId 2020-09-03 15:03:47 +01:00
J. Ryan Stinnett
fb2bde94fa Rename CrossSigningManager to SecurityManager 
The file encompasses bits of cross-signing and also secret storage / secure
backup.
 2020-09-03 14:50:49 +01:00
J. Ryan Stinnett
18d25acf4f Organise cross-signing / secret storage rageshake details 
This changes to a common prefix for cross-signing and secret storage details so
they appear all together in the alpha-sorted report.
 2020-09-03 13:43:14 +01:00
J. Ryan Stinnett
7efa9ba77d Fix DOM nesting error in cross-signing panel 
The spinner can't be inside a `<p>` element. This also changes to block spinner
to match key backup.
 2020-09-03 13:23:50 +01:00
Michael Telatynski
24006588d5 iterate PR 2020-09-03 10:34:19 +01:00
Travis Ralston
03588f8450
Merge pull request #5161 from matrix-org/travis/communities/proto/userinfo 
Communities v2 prototype: "In community" view
 2020-09-02 10:50:07 -06:00
Michael Telatynski
8484422c55
Merge pull request #5165 from matrix-org/t3chguy/fix/15080 
Respect user preference for whether pills should have an avatar or not
 2020-09-02 17:45:34 +01:00
Travis Ralston
6d62d85ad2 Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-02 10:33:52 -06:00
Travis Ralston
c849f56458
Merge pull request #5153 from matrix-org/travis/copy2 
Communities v2 prototype: DM copy updates
 2020-09-02 10:26:56 -06:00
Michael Telatynski
beb77799f6 Respect user preference for whether pills should have an avatar or not 2020-09-02 17:26:23 +01:00
Travis Ralston
9b12355b2a Appease the linter 2020-09-02 08:59:24 -06:00
J. Ryan Stinnett
129b9459a3
Merge pull request #5164 from matrix-org/jryans/cross-signing-verif-errors 
Only wait for public keys during verification
 2020-09-02 15:07:34 +01:00
J. Ryan Stinnett
4262a99f67 Tune cross-signing toasts when 4S is missing 
For the case where cross-signing is trusted on device but secret storage does
not exist, we were showing "verify this device", which is not the best match
from the existing toasts. This tunes the checks to instead show "set up
encryption" which is at least a bit closer.

Part of https://github.com/vector-im/element-web/issues/14970
 2020-09-02 14:29:41 +01:00
J. Ryan Stinnett
dd87e9a2f1 During verification, only check user trust status 
As part of new device verification, we were waiting for "cross-signing ready"
which means _both_ the public keys are trusted by this device _and_ private keys
are available. There's no guarantee that the private keys will ever arrive, so
it's too strict to wait for this as a blocking flow. This relaxes things to wait
only for the current device to trust public keys.

Fixes https://github.com/vector-im/element-web/issues/14970
 2020-09-02 14:13:36 +01:00
Michael Telatynski
cffe902504 Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling 2020-09-02 12:00:35 +01:00
Michael Telatynski
6178b3c0e2 Wire up resizeNotifier 2020-09-02 11:13:00 +01:00
Michael Telatynski
243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Travis Ralston
92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
Travis Ralston
afec470ec3 Merge branch 'develop' into travis/copy2 2020-09-01 10:50:58 -06:00
RiotRobot
0d290c9bd2 Reset matrix-js-sdk back to develop branch 2020-09-01 17:39:09 +01:00
RiotRobot
52691a1a42 Merge branch 'master' into develop 2020-09-01 17:38:21 +01:00
RiotRobot
9df5371dca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2020-09-01 17:37:52 +01:00
RiotRobot
d1d823dcc7 v3.3.0 2020-09-01 17:36:21 +01:00
RiotRobot
69e5ed56ae Prepare changelog for v3.3.0 2020-09-01 17:36:20 +01:00
RiotRobot
bb248670a6 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:02:49 +01:00
Michael Telatynski
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts 
Fix eslint ts override tsx matching and delint
 2020-09-01 16:44:22 +01:00