Commit graph

21575 commits

Author SHA1 Message Date
Weblate
c0d034a1c4 Merge branch 'origin/develop' into Weblate. 2020-01-24 09:50:30 +00:00
David Baker
50b05551ba
Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader
Remove riot logo from the security setup screens
2020-01-24 09:50:25 +00:00
Weblate
20da361acd Merge branch 'origin/develop' into Weblate. 2020-01-24 09:38:33 +00:00
Kévin C
169852adec Translated using Weblate (French)
Currently translated at 100.0% (2053 of 2053 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-24 09:38:32 +00:00
David Baker
81caa12b16
Merge pull request #3917 from matrix-org/dbkr/complete_security_detect_success
Only say the session is verified if it is now verified
2020-01-24 09:38:25 +00:00
David Baker
99252e08b0 Unintentional commit 2020-01-24 09:37:43 +00:00
David Baker
cd4e75c378 Unnecessary blank line 2020-01-24 09:36:22 +00:00
Damir Jelić
72a58d0c2c DisableEventIndexDialog: Properly indent the content of the BaseDialog. 2020-01-24 09:59:26 +01:00
Damir Jelić
b59863781f DisableEventIndexDialog: Fix a typo. 2020-01-24 09:58:17 +01:00
Damir Jelić
93facca479 ManageEventIndex: Rename the file to contain the Dialog suffix. 2020-01-24 09:54:46 +01:00
Damir Jelić
f763ae3c7b DisableEventIndex: Rename the file to contain the Dialog suffix. 2020-01-24 09:50:58 +01:00
Damir Jelić
4ea2d4f90e ManageEventIndex: Rewrite the docs and rename the dialog class. 2020-01-24 09:45:29 +01:00
Damir Jelić
d30fd3eac0 DisableEventIndex: Rename the class. 2020-01-24 09:39:56 +01:00
Damir Jelić
86a098fcd9 DisableEventIndex: Remove a blank line and rewrite a doc comment. 2020-01-24 09:39:40 +01:00
Travis Ralston
12fa94106e Actually add the secret to the QR code url 2020-01-23 20:19:17 -07:00
Travis Ralston
b7e680ba51 Fix key ID 2020-01-23 20:14:27 -07:00
Travis Ralston
0ce9da5d36 Appease the linter 2020-01-23 20:12:24 -07:00
Travis Ralston
ebcc4d573b Add trace logging to figure out which component is causing weird events
For https://github.com/vector-im/riot-web/issues/11120
2020-01-23 20:10:31 -07:00
Travis Ralston
b682e7d908 Generate a QR code for apps to scan 2020-01-23 20:05:32 -07:00
Travis Ralston
586a240e41 Don't use private keys for QR code 2020-01-23 19:29:54 -07:00
Travis Ralston
1ec746c014 Add verification with QR codes 2020-01-23 19:29:54 -07:00
Travis Ralston
32f9a4e623 Add some debugging around the recently DM'd users
The suggestions are relatively stable, but the recents have some issues. Adding logging to the suggestions would also destroy the console log with thousands of messages whereas recents aren't too bad.
2020-01-23 17:35:36 -07:00
Travis Ralston
442ab9f301 Clear the filter when a suggestion is accepted/added 2020-01-23 17:27:37 -07:00
Travis Ralston
b5f22001b1 Fix copy 2020-01-23 17:22:39 -07:00
Weblate
12b8bd7344 Merge branch 'origin/develop' into Weblate. 2020-01-23 23:43:08 +00:00
Travis Ralston
d3960b8c54
Merge pull request #3924 from matrix-org/travis/sso-pw
Hide password section if you can't change your password
2020-01-23 16:43:01 -07:00
Travis Ralston
1394331133 Fix booleans 2020-01-23 16:33:33 -07:00
Travis Ralston
c22bfa84b7 Hide password section if you can't change your password
Fixes https://github.com/vector-im/riot-web/issues/11950
2020-01-23 16:29:55 -07:00
Weblate
bdcf9452d4 Merge branch 'origin/develop' into Weblate. 2020-01-23 23:02:57 +00:00
Travis Ralston
beb2503542
Merge pull request #3922 from matrix-org/travis/fix-copy
Ensure a plaintext version of the composer ends up on the clipboard
2020-01-23 16:02:52 -07:00
Travis Ralston
dbcfa86d7f
Merge pull request #3923 from matrix-org/travis/fix-copy-release
Ensure a plaintext version of the composer ends up on the clipboard
2020-01-23 16:02:49 -07:00
Travis Ralston
6adfa35445 Ensure a plaintext version of the composer ends up on the clipboard
Fixes https://github.com/vector-im/riot-web/issues/12018
2020-01-23 15:53:48 -07:00
Travis Ralston
915c4efeac Ensure a plaintext version of the composer ends up on the clipboard
Fixes https://github.com/vector-im/riot-web/issues/12018
2020-01-23 15:53:32 -07:00
Weblate
22a6bcfc17 Merge branch 'origin/develop' into Weblate. 2020-01-23 22:46:16 +00:00
Travis Ralston
40cb9e5dd9
Merge pull request #3920 from matrix-org/travis/fix-build
Move & upgrade babel runtime into dependencies (like it wants)
2020-01-23 15:46:11 -07:00
Travis Ralston
d899dcc2ee
Merge pull request #3921 from matrix-org/travis/fix-build-release
Move & upgrade babel runtime into dependencies (like it wants)
2020-01-23 15:46:04 -07:00
Travis Ralston
a330ee186a Move & upgrade babel runtime into dependencies (like it wants)
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:43:48 -07:00
Travis Ralston
4aa3be9b42 Move & upgrade babel runtime into dependencies (like it wants)
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:43:22 -07:00
Weblate
d807a1b21e Merge branch 'origin/develop' into Weblate. 2020-01-23 22:09:15 +00:00
Travis Ralston
db58199e03
Merge pull request #3919 from matrix-org/travis/alias-release
Don't list every single alias when there's many
2020-01-23 15:09:12 -07:00
Travis Ralston
ed93761b00
Merge pull request #3918 from matrix-org/travis/aliases
Don't list every single alias when there's many
2020-01-23 15:09:08 -07:00
Travis Ralston
6f6d149a70 Don't list every single alias when there's many 2020-01-23 15:01:23 -07:00
Travis Ralston
18f8f8858c Don't list every single alias when there's many 2020-01-23 15:00:18 -07:00
Weblate
adb3066567 Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:13 +00:00
Travis Ralston
1ac82a9f16 Revert "Don't list every single alias when there's many"
This reverts commit 6fc647c3d9.
2020-01-23 15:00:02 -07:00
Weblate
813947fbde Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:02 +00:00
Travis Ralston
6fc647c3d9 Don't list every single alias when there's many 2020-01-23 14:59:52 -07:00
Weblate
af70fb7e28 Merge branch 'origin/develop' into Weblate. 2020-01-23 21:49:35 +00:00
catborise
4cff50a11e Translated using Weblate (Turkish)
Currently translated at 72.9% (1494 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-23 21:49:34 +00:00
Travis Ralston
6be0cb92ff
Merge pull request #3907 from matrix-org/travis/user-lists-suggestions
Try to populate user IDs even when the server's directory fails us
2020-01-23 14:49:27 -07:00