Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,946 Commits 206 Branches 552 Tags 519 MiB
6d62d85ad2
Commit Graph

27946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michael Telatynski
d668f8018b undo some delint 2020-09-01 15:59:19 +01:00
Michael Telatynski
6c39213116 remove unused class TextHighlighter 2020-09-01 15:37:07 +01:00
Michael Telatynski
a13cc0ce6a
Merge pull request #5159 from matrix-org/t3chguy/react-err 
Fix react error about functional components can't take refs
 2020-09-01 09:13:42 +01:00
Michael Telatynski
3b68da5f42
Merge pull request #5156 from matrix-org/t3chguy/crc 
Remove redundant components and devDependencies
 2020-09-01 09:12:46 +01:00
Michael Telatynski
656a815991 delint some more 2020-09-01 09:07:46 +01:00
Travis Ralston
78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston
b4f62e9c88 use valid jsdoc 2020-08-31 11:07:29 -06:00
Travis Ralston
29089821f4 Merge branch 'develop' into travis/copy2 2020-08-31 11:03:01 -06:00
Travis Ralston
7f7414ed5a Appease the linter 2020-08-31 10:59:37 -06:00
Travis Ralston
fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston
133f981fa8 Run the tag selection behaviour through the prototype store too 2020-08-31 10:22:29 -06:00
Travis Ralston
724e3f6905 Run all selected prototype community logic through one store 2020-08-31 10:19:05 -06:00
Travis Ralston
93d67a6689 Wire up members button to member view 
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
 2020-08-31 10:12:12 -06:00
Michael Telatynski
da97d8885b Fix react error about functional components can't take props 2020-08-29 13:51:43 +01:00
Michael Telatynski
ac9108a9a6 i18n 2020-08-29 12:16:14 +01:00
Michael Telatynski
672d0fe97b Remove redundant components and devDependencies 2020-08-29 12:09:07 +01:00
Travis Ralston
281e2ab27b Null guard new function to reduce error spam 2020-08-28 20:13:26 -06:00
Travis Ralston
275ff6b41e Wire up the invite button 2020-08-28 20:08:12 -06:00
Travis Ralston
35e4d89545 Add aria labels to menu options 2020-08-28 20:04:19 -06:00
Michael Telatynski
9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
Travis Ralston
02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston
0ffa548864 Change the menu button to a chevron 
by design request
 2020-08-28 15:37:23 -06:00
Travis Ralston
90d9d7128d Use FlairStore's cache for group naming 
Turns out GroupStore doesn't really know much.
 2020-08-28 14:56:59 -06:00
Travis Ralston
e68c4efd0b Merge branch 'travis/copy2' into travis/communities/proto/userinfo 2020-08-28 13:54:03 -06:00
Travis Ralston
fb54b62be9 Appease the rest of the linter 2020-08-28 13:42:19 -06:00
Travis Ralston
6f237161fd Appease the linter 2020-08-28 13:28:54 -06:00
Travis Ralston
e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Michael Telatynski
b1cc078543
Merge pull request #5154 from matrix-org/t3chguy/display-capture 
Add display-capture to iframe allow for widgets
 2020-08-28 18:18:44 +01:00
Michael Telatynski
2823156ef6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture 2020-08-28 17:26:10 +01:00
Michael Telatynski
b9cfa95ceb Add display-capture to iframe allow 2020-08-28 17:06:56 +01:00
Travis Ralston
cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change 
Update create room dialog copy & community prototype home icon
 2020-08-28 09:47:53 -06:00
Travis Ralston
f038103f97 Fix copy 2020-08-28 09:47:36 -06:00
J. Ryan Stinnett
e2acec6059
Merge pull request #5149 from matrix-org/jryans/defer-cross-signing-setup 
Migrate to new, separate APIs for cross-signing and secret storage
 2020-08-28 12:40:35 +01:00