Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
25,011 Commits 1 Branch 646 Tags
6d11b4f99bbcccdecb5eca2e5061ba4c82ca5b18
Commit Graph

19925 Commits

Author SHA1 Message Date
Travis Ralston 9edc361afc Use new imports for js-sdk's ContentRepo 
Per https://github.com/matrix-org/matrix-js-sdk/pull/1134/commits/f4d1c5c006027962cd18dffb3f7c521d9e24e831
 2020-01-03 12:29:22 -07:00
Weblate 6aab061fb9 Merge branch 'origin/develop' into Weblate. 2020-01-03 17:32:30 +00:00
Travis Ralston 65954b1e1b Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial 
Initial implementation of FTUE user lists design
 2020-01-03 10:32:24 -07:00
Travis Ralston 752482964a Purify the components 2020-01-03 10:24:07 -07:00
Weblate b97736f058 Merge branch 'origin/develop' into Weblate. 2020-01-03 16:32:09 +00:00
J. Ryan Stinnett 76f3a08909 Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
Weblate 5096696f4b Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:01 +00:00
Slavi Pantaleev 33d35c83ba Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 16:04:01 +00:00
J. Ryan Stinnett e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker 2125bcf5a6 Comment remaining non-cross-signing-compliant components 
Fixes https://github.com/vector-im/riot-web/issues/11748
 2020-01-03 15:38:59 +00:00
J. Ryan Stinnett b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
Weblate b79e1d47c4 Merge branch 'origin/develop' into Weblate. 2020-01-03 15:24:03 +00:00
Slavi Pantaleev 731279ab2d Translated using Weblate (Bulgarian) 
Currently translated at 99.2% (1985 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 15:24:03 +00:00
David Baker 5faae1d2f2 i18n 2020-01-03 15:05:41 +00:00
David Baker 5897c8ca7f Remove 'unverify' from UserInfoPanel 
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
 2020-01-03 15:00:51 +00:00
Weblate f25c1683c8 Merge branch 'origin/develop' into Weblate. 2020-01-03 14:52:50 +00:00
Slavi Pantaleev 0b16f862e9 Translated using Weblate (Bulgarian) 
Currently translated at 97.8% (1956 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 14:52:49 +00:00
Half-Shot 50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot 668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
J. Ryan Stinnett 4211ec5063 Fix DOM structure in RoomRecoveryReminder 
Buttons (which end up as <div>s) aren't allowed inside <p>s.
 2020-01-03 13:51:45 +00:00
J. Ryan Stinnett d5a82a5fc2 Finish sentence in accessSecretStorage docs 2020-01-03 13:45:57 +00:00
David Baker 43e4f2dcc0 Use deviceTrust when displaying key backup trust status 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
 2020-01-03 13:34:43 +00:00
J. Ryan Stinnett 99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
Weblate b0e71daa61 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:52 +00:00
David Baker bcece7dc10 Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed 
Don't crash if a keyshare request is removed
 2020-01-03 13:08:47 +00:00
Weblate 831ad3ba33 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:40 +00:00
catborise c8f9df691b Translated using Weblate (Turkish) 
Currently translated at 50.8% (1017 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-03 13:08:40 +00:00
Slavi Pantaleev b6572f7042 Translated using Weblate (Bulgarian) 
Currently translated at 97.4% (1948 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 13:08:35 +00:00
Bruno Windels 7a88a94936 fixes! 2020-01-03 13:50:13 +01:00
Bruno Windels 3b9c5c0a27 remove unused code 2020-01-03 13:50:13 +01:00
Bruno Windels 52c7c5b837 render done tile as accepted 2020-01-03 13:50:13 +01:00
Bruno Windels b49c471f05 render empty tiles when no request 2020-01-03 13:50:13 +01:00
Bruno Windels 075e42c076 use transactionId as key for react 2020-01-03 13:50:13 +01:00
Bruno Windels de1c3e2f83 use same style as UserInfo for sections and paragraphs 2020-01-03 13:50:13 +01:00
Bruno Windels 2dd1e93d84 show message after clicking "they match" 2020-01-03 13:50:13 +01:00
Bruno Windels dd633bd8fe port toast to use VerificationRequest and open right panel, not dialog 2020-01-03 13:50:13 +01:00
Bruno Windels 1aebc95793 slightly better copy 2020-01-03 13:50:13 +01:00
Bruno Windels f4a276c052 port MVerificationConclusion to use VerificationRequest 2020-01-03 13:50:13 +01:00
Bruno Windels d57e76f3e2 hide verify button for own member 2020-01-03 13:50:13 +01:00
Bruno Windels 8c5f3d6d94 show devices and unverify action also in unencrypted rooms 2020-01-03 13:48:35 +01:00
Bruno Windels b80bfd04b2 make sure to have roomId of DM when starting verif. req. 2020-01-03 13:47:38 +01:00
Bruno Windels b866c16071 show cancellation 2020-01-03 13:47:38 +01:00
Bruno Windels db17321777 await verify so errors (like cancellation) are caught 2020-01-03 13:47:38 +01:00
Bruno Windels b36df73300 fix for ref refactor pr 2020-01-03 13:47:38 +01:00
Bruno Windels 41cf18701f remove now-unused import 2020-01-03 13:47:38 +01:00
Bruno Windels 2c28fa0568 use verif in right panel from "verify" button 2020-01-03 13:47:38 +01:00
Bruno Windels 9e4b65de6a fixup after rebase 2020-01-03 13:42:18 +01:00
Bruno Windels 0f415038be actually start verify process in verification panel 
temporary code, as ux is not complete
 2020-01-03 13:42:18 +01:00
Bruno Windels c02fc44d25 WIP sas in right panel 2020-01-03 13:42:17 +01:00
Bruno Windels d8a38e6b74 WIP 2020-01-03 13:42:17 +01:00