Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,642 Commits 206 Branches 552 Tags 519 MiB
281cc223ed
Commit Graph

17316 Commits

Author SHA1 Message Date
Bruno Windels
a1844e44f2 remove methods arg to requestVerification(DM) 
as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
 2020-02-11 18:22:48 +01:00
Weblate
99bbc2bdae Merge branch 'origin/develop' into Weblate. 2020-02-11 17:20:46 +00:00
Bruno Windels
91c9c00712
Merge pull request #4044 from matrix-org/bwindels/riotx-qr-compat 
Make QR self-verification compatible with RiotX
 2020-02-11 17:20:40 +00:00
Zoe
5382a52519 Fixed bug where key reset didn't always return the right key 2020-02-11 15:57:14 +00:00
Weblate
a56d21d80a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:30 +00:00
Bruno Windels
7a026eb15d
Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick 
Verify single device from other user in right panel & Not Trusted dialog
 2020-02-11 15:35:24 +00:00
Weblate
0e366c3ddd Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:06 +00:00
Bruno Windels
1d39aa6a81
Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable 
Disable verification buttons after clicking to avoid double submission
 2020-02-11 15:35:00 +00:00
Weblate
f206baadd1 Merge branch 'origin/develop' into Weblate. 2020-02-11 15:34:32 +00:00
Bruno Windels
703f52be33
Merge pull request #4048 from matrix-org/bwindels/toasttuning 
Verification toast fixes
 2020-02-11 15:34:26 +00:00
Bruno Windels
5267dbf44a
Update src/components/views/right_panel/UserInfo.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-11 15:21:01 +00:00
Weblate
628be1e90a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:16:54 +00:00
Bruno Windels
a84e90df51
Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere 
Use EncryptionPanel everywhere, part I
 2020-02-11 15:16:47 +00:00
Weblate
ae237901b0 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:44:08 +00:00
Zoe
e54d34090a
Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove 
quick fix for cross-signing reset bug
 2020-02-11 13:44:02 +00:00
Zoe
cbb0ad6621 god i hate the i18n linter 2020-02-11 13:20:27 +00:00
Weblate
0482a277e1 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:19:24 +00:00
Zoe
8c36792840
Merge pull request #4055 from matrix-org/foldleft/12288-correct-feedback-order 
Fix error message rendering for key entry
 2020-02-11 13:19:18 +00:00
Zoe
627ced3838 quick fix for cross-signing reset bug 2020-02-11 13:17:18 +00:00
Zoe
a677780889 i18n 2020-02-11 12:05:58 +00:00
Zoe
6b6d612041 Fix error message rendering for key entry 
Relates to https://github.com/vector-im/riot-web/issues/12288
 2020-02-11 12:02:12 +00:00
Weblate
b8e75ef440 Merge branch 'origin/develop' into Weblate. 2020-02-11 10:18:49 +00:00
Michael Telatynski
67aa241ee5
Merge pull request #4052 from matrix-org/t3chguy/recaptcha_protocol 
Fix recaptcha blocked by CSP for non-SSL origins
 2020-02-11 10:18:44 +00:00
Weblate
56b723353b Merge branch 'origin/develop' into Weblate. 2020-02-11 10:11:26 +00:00
Michael Telatynski
ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID 2020-02-11 09:32:09 +00:00
Weblate
70d12607dd Merge branch 'origin/develop' into Weblate. 2020-02-11 09:30:35 +00:00
Michael Telatynski
f381099f2a
Merge pull request #4053 from matrix-org/t3chguy/server_enter 
Allow custom hs url submission on enter
 2020-02-11 09:30:29 +00:00
Weblate
da737952ec Merge branch 'origin/develop' into Weblate. 2020-02-11 08:19:39 +00:00
Kévin C
136dca7837 Translated using Weblate (French) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-11 08:19:39 +00:00
Stanislav Lukeš
5436662d92 Translated using Weblate (Czech) 
Currently translated at 98.7% (2082 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-11 08:19:39 +00:00
Jeff Huang
dd4aaf230a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-11 08:19:38 +00:00
Besnik Bleta
f5111a6290 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2103 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-11 08:19:37 +00:00
Bruno Windels
1e94929b88
Merge pull request #4045 from matrix-org/bwindels/qrcodetuning 
Support keepSecretStoragePassphraseForSession at the config level too
 2020-02-11 08:19:29 +00:00
Michael Telatynski
f01b4fe241 Allow custom hs url submission on enter 2020-02-10 20:47:27 +00:00
Michael Telatynski
86306e3da3 Recaptcha should always be loaded over https 2020-02-10 20:41:16 +00:00
Weblate
8365f9d88d Merge branch 'origin/develop' into Weblate. 2020-02-10 18:01:58 +00:00
Michael Telatynski
b9db0ad013
Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs 
Add setting to allow hiding of typing indicator
 2020-02-10 18:01:52 +00:00
Weblate
39318d6c6a Merge branch 'origin/develop' into Weblate. 2020-02-10 17:14:11 +00:00
Zoe
d47d13256f
Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing 
Button to reset cross-signing and SSSS keys
 2020-02-10 17:14:05 +00:00
Zoe
2d42505124 and re-run yarn i18n 2020-02-10 17:00:03 +00:00
Zoe
4f4b52d666
Update src/components/views/settings/CrossSigningPanel.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-10 16:59:17 +00:00
Bruno Windels
9dde09d36f cleanup 2020-02-10 17:35:10 +01:00
Travis Ralston
ccde5530d2 Add reciprocate as a method 2020-02-10 17:34:45 +01:00
Travis Ralston
afc38b92a0 Always send scan for RiotX (for now) 2020-02-10 17:33:19 +01:00
Travis Ralston
ea7cb6ba0b Support keepSecretStoragePassphraseForSession at the config level too 2020-02-10 17:15:08 +01:00
Bruno Windels
4b8382b5c4 remove dead code 2020-02-10 17:07:02 +01:00
Bruno Windels
1ff1575b42 remove dead code 2020-02-10 16:59:47 +01:00
Zoe
69dc725006 rename button 2020-02-10 15:43:02 +00:00
Bruno Windels
936b40f6b5 remove commented out code 2020-02-10 16:19:27 +01:00
Bruno Windels
a693af0c6b fix lint 2020-02-10 16:19:27 +01:00
Bruno Windels
2a8453b939 i18n fixes 2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29 move css to correct file 
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
 2020-02-10 16:19:27 +01:00
Bruno Windels
8c3004c2ac to_device requests now can include .request so we might need send .ready 2020-02-10 16:19:27 +01:00
Bruno Windels
a865cfb013 put encryption in a proper dialog with close button 2020-02-10 16:19:27 +01:00
Bruno Windels
39fab02fcc rename DeviceVerifyOwnDialog to VerificationRequestDialog 
as it works (and we want to use it) for any verification request,
not just between two devices of the same user
 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
ee23bfe625 need to close the current dialog before opening a new modal 2020-02-10 16:19:27 +01:00
Bruno Windels
f368339b78 cram EncryptionPanel into a Dialog when clicking from new session dialog 2020-02-10 16:19:27 +01:00
Bruno Windels
b210c9cb76 close dialog after clicking continue 2020-02-10 16:19:27 +01:00
Travis Ralston
469d533964 Apply some CSS 2020-02-10 16:19:27 +01:00
Bruno Windels
747a4866e2 indenting 2020-02-10 16:19:27 +01:00
Bruno Windels
3d91ff23ec cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog 
so we get QR code support and support phases prior to STARTED
 2020-02-10 16:19:27 +01:00
Travis Ralston
bc5a59339b Send NewSessionReviewDialog through dialogs 2020-02-10 16:19:27 +01:00
Bruno Windels
5866d67c88 Alterations to DeviceVerifyDialog to support picking QR code 2020-02-10 16:18:44 +01:00
Bruno Windels
6b85ca2fb9 add qr code method to new session dialog 2020-02-10 16:17:49 +01:00
Bruno Windels
496dfc6187 send a .request and open it in the right panel on new session verify 2020-02-10 16:17:05 +01:00
Weblate
2f31a0716a Merge branch 'origin/develop' into Weblate. 2020-02-10 11:56:12 +00:00
catborise
cc5a826869 Translated using Weblate (Turkish) 
Currently translated at 70.6% (1486 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-10 11:56:12 +00:00
Szimszon
502c32e691 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-10 11:56:12 +00:00
Kévin C
23536a7e35 Translated using Weblate (French) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-10 11:56:12 +00:00
J. A. Durieux
444ec33560 Translated using Weblate (Dutch) 
Currently translated at 83.7% (1762 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-10 11:56:11 +00:00
Stanislav Lukeš
c14f67dba8 Translated using Weblate (Czech) 
Currently translated at 98.6% (2075 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-10 11:56:10 +00:00
Osoitz
7812d821fd Translated using Weblate (Basque) 
Currently translated at 98.6% (2075 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-10 11:56:09 +00:00
Besnik Bleta
91c8ad88d7 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2099 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-10 11:56:07 +00:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
2230e746aa sprinkle preventDefaults on form submission handlers 2020-02-09 15:03:28 +00:00
Michael Telatynski
0393a57b5a fix submit button disabled breaking async task 2020-02-09 14:49:54 +00:00
Michael Telatynski
150f2b3f84 Merge branches 'develop' and 't3chguy/password_completion' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/password_completion 2020-02-09 14:19:44 +00:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Bruno Windels
5c89b41177 make device verification go over right panel (after showing dialog) 
dialog should be more or less as in the design
 2020-02-07 18:36:46 +01:00
Bruno Windels
e016cbefff support header image in QuestionDialog 2020-02-07 18:36:41 +01:00
Zoe
a260d7a147 manual lint 2020-02-07 15:53:43 +00:00
Zoe
b08c5d8410 lint 2020-02-07 15:46:31 +00:00
Weblate
f2fee50711 Merge branch 'origin/develop' into Weblate. 2020-02-07 15:38:01 +00:00
random
066faa18f1 Translated using Weblate (Italian) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-07 15:38:01 +00:00
Jeff Huang
ce39d1de70 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-07 15:38:00 +00:00
Travis Ralston
3c49515e08
Merge pull request #4001 from matrix-org/travis/qr-code-request-based 
Update QR code rendering to support VerificationRequests
 2020-02-07 15:37:53 +00:00
Travis Ralston
f6abd369ca Fix comments 2020-02-07 15:36:57 +00:00
Travis Ralston
bdeb9cccc4 Rename estimatedTargetDevice to targetDevice 2020-02-07 15:34:45 +00:00
Bruno Windels
1a5bed5a10 open a to_device request in a modal instead of the right panel 1st room 2020-02-07 15:56:10 +01:00
Zoe
8fdae73e03 Button to reset cross-signing and SSSS keys 2020-02-07 14:55:01 +00:00
Bruno Windels
577121e88d disable "verify by emoji" after clicking it 2020-02-07 15:50:51 +01:00
Bruno Windels
413a149b47 disable "Accept"/"Decline" buttons on verif tile after clicking 
to avoid sending double events
 2020-02-07 15:50:42 +01:00
Bruno Windels
049a6d2064 hide toast when request is accepted 
if this is a .request > .ready request, dismissing when in .ready is what we want, as that is how you accept the request
if this is a .start request, we shouldn't dismiss

so only add .ready to the phases to hide the toast, not .started
 2020-02-07 15:49:44 +01:00
Bruno Windels
fa13bb9689 make the verif toast work with to_device request that do .request/.ready 2020-02-07 15:49:36 +01:00
Weblate
999414dc66 Merge branch 'origin/develop' into Weblate. 2020-02-07 08:59:04 +00:00
Szimszon
9a0bc15548 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-07 08:59:04 +00:00
Sylvestre Ledru
6d0aab2a2d Translated using Weblate (French) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-07 08:59:03 +00:00
Kévin C
2bafc1ebc8 Translated using Weblate (French) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-07 08:59:03 +00:00
Bruno Windels
720450f372
Merge pull request #4038 from matrix-org/bwindels/4sunlockpurpose 
Differentiate AccessSecretStorageDialog dismiss dialog based on which key we want to read
 2020-02-07 08:58:53 +00:00