OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,928 Commits
217 Branches
562 Tags
492 MiB
Commit Graph

27928 Commits (c849f56458842f284d95a4655583a3bd53080264)

Author SHA1 Message Date
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
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 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 29089821f4 Merge branch 'develop' into travis/copy2 2020-08-31 11:03:01 -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
Michael Telatynski 9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01: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
J. Ryan Stinnett f634c3a71e Add secret storage cache callback to avoid prompts 
This supplies a cache callback to the JS SDK so that we can be notified if a new
storage key is created e.g. by resetting secret storage. This allows it to be
supplied automatically in case it's needed in the same user operation, as it is
when resetting both secret storage and cross-signing together.
 2020-08-28 12:10:17 +01:00
Travis Ralston 898136e44d
Merge pull request #5152 from matrix-org/travis/communities/fix-clear 
Fix clicking the background of the tag panel not clearing the filter
 2020-08-27 15:06:58 -06:00
Travis Ralston 3c176f762e Remove disabled clear button from tag panel + dead code 2020-08-27 14:27:06 -06:00
Travis Ralston bbd343f414 Fix clicking the background of the tag panel not clearing the filter 
Fixes https://github.com/vector-im/element-web/issues/12988
 2020-08-27 14:17:55 -06:00
Travis Ralston be1de1d295 Update create room dialog copy 2020-08-27 13:49:40 -06:00
Travis Ralston 13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Travis Ralston 8a5dc7edd7
Merge pull request #5147 from matrix-org/travis/communities/proto/create-room 
Communities v2 prototype: Associate created rooms with the selected community
 2020-08-27 08:05:04 -06:00
J. Ryan Stinnett 3a98b4b4e9 Rename reset secret storage prop 
The bare word `force` has bothered me, so this adds a tiny amount more meaning.
 2020-08-27 13:50:50 +01:00
J. Ryan Stinnett 4a807f9385 Migrate to new, separate APIs for cross-signing and secret storage 
This migrates to the new JS SDK APIs, which now use separate paths for
cross-signing and secret storage setup. There should be no functional change
here.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-08-27 13:41:03 +01:00
Travis Ralston 4f29770adb Force the GroupStore to update after creating a prototype community 2020-08-26 11:02:14 -06:00
Travis Ralston 027f263589 Remove prototype code from CreateGroupDialog 
The prototype code paths prevent users from ending up here, so we don't need custom code.
 2020-08-26 11:01:58 -06:00
Travis Ralston c28134eb11 Associate created rooms with the selected community 2020-08-26 10:53:06 -06:00
Travis Ralston fd71bca7c0 Change menu label if in a community 2020-08-26 10:33:05 -06:00
Travis Ralston b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher 
Communities v2 prototype: Tag panel selection changes
 2020-08-26 10:22:50 -06:00
Travis Ralston 82949c038a
Merge pull request #5144 from matrix-org/travis/communities/proto/create-flow 
Communities v2 prototype: Create community flow
 2020-08-26 09:07:17 -06:00
Travis Ralston 82b015bd5f Rename components to match prior convention 2020-08-26 08:52:39 -06:00
Travis Ralston 3e7d82b421 Change tip copy 2020-08-26 08:48:01 -06:00
Travis Ralston 0c67a42b0f Make padding only on the prototype tag panel 2020-08-26 08:42:26 -06:00