b8e75ef440
Merge branch 'origin/develop' into Weblate.
2020-02-11 10:18:49 +00:00
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
56b723353b
Merge branch 'origin/develop' into Weblate.
2020-02-11 10:11:26 +00:00
36fa6261cf
Merge pull request #4054 from matrix-org/t3chguy/showTypingNotifications
...
Fix watcher for showTypingNotifications setting
2020-02-11 10:11:20 +00:00
ee819dfdf8
fix call to SettngsStore.watchSetting, it takes a roomID
2020-02-11 09:32:09 +00:00
70d12607dd
Merge branch 'origin/develop' into Weblate.
2020-02-11 09:30:35 +00:00
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
da737952ec
Merge branch 'origin/develop' into Weblate.
2020-02-11 08:19:39 +00:00
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
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
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
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
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
f01b4fe241
Allow custom hs url submission on enter
2020-02-10 20:47:27 +00:00
86306e3da3
Recaptcha should always be loaded over https
2020-02-10 20:41:16 +00:00
3da630beb8
I have removed problematic ligns
2020-02-10 21:38:31 +01:00
8365f9d88d
Merge branch 'origin/develop' into Weblate.
2020-02-10 18:01:58 +00:00
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
39318d6c6a
Merge branch 'origin/develop' into Weblate.
2020-02-10 17:14:11 +00:00
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
2d42505124
and re-run yarn i18n
2020-02-10 17:00:03 +00:00
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
9dde09d36f
cleanup
2020-02-10 17:35:10 +01:00
ccde5530d2
Add reciprocate as a method
2020-02-10 17:34:45 +01:00
afc38b92a0
Always send scan for RiotX (for now)
2020-02-10 17:33:19 +01:00
ea7cb6ba0b
Support keepSecretStoragePassphraseForSession at the config level too
2020-02-10 17:15:08 +01:00
4b8382b5c4
remove dead code
2020-02-10 17:07:02 +01:00
1ff1575b42
remove dead code
2020-02-10 16:59:47 +01:00
69dc725006
rename button
2020-02-10 15:43:02 +00:00
936b40f6b5
remove commented out code
2020-02-10 16:19:27 +01:00
0e0b0e8d09
fix css lint
2020-02-10 16:19:27 +01:00
a693af0c6b
fix lint
2020-02-10 16:19:27 +01:00
2a8453b939
i18n fixes
2020-02-10 16:19:27 +01:00
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
8c3004c2ac
to_device requests now can include .request so we might need send .ready
2020-02-10 16:19:27 +01:00
a865cfb013
put encryption in a proper dialog with close button
2020-02-10 16:19:27 +01:00
d9b7b28e5a
add css hacks to make EncryptionPanel look ok in Dialog
...
for the sas and verified phase
2020-02-10 16:19:27 +01:00
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
ea4d97fa73
Hack in a layout option
2020-02-10 16:19:27 +01:00
ee23bfe625
need to close the current dialog before opening a new modal
2020-02-10 16:19:27 +01:00
f368339b78
cram EncryptionPanel into a Dialog when clicking from new session dialog
2020-02-10 16:19:27 +01:00
b210c9cb76
close dialog after clicking continue
2020-02-10 16:19:27 +01:00
469d533964
Apply some CSS
2020-02-10 16:19:27 +01:00
747a4866e2
indenting
2020-02-10 16:19:27 +01:00
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
bc5a59339b
Send NewSessionReviewDialog through dialogs
2020-02-10 16:19:27 +01:00
5866d67c88
Alterations to DeviceVerifyDialog to support picking QR code
2020-02-10 16:18:44 +01:00
6b85ca2fb9
add qr code method to new session dialog
2020-02-10 16:17:49 +01:00
496dfc6187
send a .request and open it in the right panel on new session verify
2020-02-10 16:17:05 +01:00
2f31a0716a
Merge branch 'origin/develop' into Weblate.
2020-02-10 11:56:12 +00:00
Weblate