423786807f
Merge branch 'origin/develop' into Weblate.
2020-01-24 11:14:59 +00:00
1d686fe49e
Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration
...
Room list reflects encryption state
2020-01-24 11:14:53 +00:00
6cce65a2a5
fix lint
2020-01-24 12:08:47 +01:00
ecfecfe559
EventIndex: Fix a small style issue.
2020-01-24 12:07:03 +01:00
395c82b1e5
Update src/components/structures/RoomView.js
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-24 11:04:40 +00:00
512bd4b0b2
show to_device verification in dialog, not right panel
...
this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
2020-01-24 11:59:17 +01:00
2483337e89
don't use removed .event property anymore on verification request
2020-01-24 11:59:01 +01:00
b7c9f5307d
Merge branch 'origin/develop' into Weblate.
2020-01-24 10:22:22 +00:00
0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll
...
Make the entire User Info scrollable, sticky close button
2020-01-24 10:22:17 +00:00
b72ab57e1b
add <Tooltip/> to <E2EIcon/>
2020-01-24 10:13:03 +00:00
c0d034a1c4
Merge branch 'origin/develop' into Weblate.
2020-01-24 09:50:30 +00:00
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
20da361acd
Merge branch 'origin/develop' into Weblate.
2020-01-24 09:38:33 +00:00
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
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
99252e08b0
Unintentional commit
2020-01-24 09:37:43 +00:00
cd4e75c378
Unnecessary blank line
2020-01-24 09:36:22 +00:00
12fa94106e
Actually add the secret to the QR code url
2020-01-23 20:19:17 -07:00
b7e680ba51
Fix key ID
2020-01-23 20:14:27 -07:00
0ce9da5d36
Appease the linter
2020-01-23 20:12:24 -07:00
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
b682e7d908
Generate a QR code for apps to scan
2020-01-23 20:05:32 -07:00
586a240e41
Don't use private keys for QR code
2020-01-23 19:29:54 -07:00
1ec746c014
Add verification with QR codes
2020-01-23 19:29:54 -07:00
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
442ab9f301
Clear the filter when a suggestion is accepted/added
2020-01-23 17:27:37 -07:00
b5f22001b1
Fix copy
2020-01-23 17:22:39 -07:00
12b8bd7344
Merge branch 'origin/develop' into Weblate.
2020-01-23 23:43:08 +00:00
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
1394331133
Fix booleans
2020-01-23 16:33:33 -07:00
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
bdcf9452d4
Merge branch 'origin/develop' into Weblate.
2020-01-23 23:02:57 +00:00
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
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
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
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
22a6bcfc17
Merge branch 'origin/develop' into Weblate.
2020-01-23 22:46:16 +00:00
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
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
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
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
d807a1b21e
Merge branch 'origin/develop' into Weblate.
2020-01-23 22:09:15 +00:00
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
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
6f6d149a70
Don't list every single alias when there's many
2020-01-23 15:01:23 -07:00
18f8f8858c
Don't list every single alias when there's many
2020-01-23 15:00:18 -07:00
adb3066567
Merge branch 'origin/develop' into Weblate.
2020-01-23 22:00:13 +00:00
1ac82a9f16
Revert "Don't list every single alias when there's many"
...
This reverts commit 6fc647c3d9
2020-01-23 15:00:02 -07:00
813947fbde
Merge branch 'origin/develop' into Weblate.
2020-01-23 22:00:02 +00:00
6fc647c3d9
Don't list every single alias when there's many
2020-01-23 14:59:52 -07:00
Weblate