5ccf5573da
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:57:24 +00:00
abc2808b62
Fix i18n post-merge
2020-01-24 08:57:03 -07:00
5f2df15987
Merge branch 'develop' into travis/invite-polish
2020-01-24 08:56:18 -07:00
72e7ac4a7a
Merge branch 'origin/develop' into Weblate.
2020-01-24 15:55:45 +00:00
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp
...
QR code verification
2020-01-24 08:55:40 -07:00
5ed599f6d7
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:54:56 +00:00
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass
...
Design pass for room icons
2020-01-24 13:54:51 +00:00
cbfde4d78f
Merge branch 'poljar/seshat-filepanel' into develop
2020-01-24 14:44:24 +01:00
b0bfef3b47
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:44:01 +00:00
a46646105f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2057 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:44:01 +00:00
75da5b7944
Design pass for room icons
2020-01-24 13:37:47 +00:00
6a1ab4fe17
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:31:14 +00:00
be98f24051
Translated using Weblate (Italian)
...
Currently translated at 98.8% (2032 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:31:14 +00:00
7de5f09f9f
Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper
...
Split AsyncWrapper out from Modal
2020-01-24 13:31:09 +00:00
edc13aad82
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:30:31 +00:00
6ebeb0a376
Translated using Weblate (Italian)
...
Currently translated at 98.7% (2031 of 2057 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:30:31 +00:00
330f606513
Merge pull request #3930 from matrix-org/bwindels/fixnoroom
...
Fix error in verification code on develop
2020-01-24 13:30:25 +00:00
da2b29b6e5
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:27:04 +00:00
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
...
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
37f289b120
EventIndex: Add docstrings for the FilePanel methods.
2020-01-24 14:24:25 +01:00
3534cd4202
FilePanel: Add comments to explain what's going on with the event index.
2020-01-24 14:23:43 +01:00
66768416a6
dont assume the room exist ... not sure why though
2020-01-24 14:20:48 +01:00
27ffa88ff8
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:18:15 +00:00
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer
...
Cross Signing redesign for composer
2020-01-24 13:18:09 +00:00
590ff29e60
Unused import
2020-01-24 13:15:57 +00:00
c5ecd83bc1
remove .orig file
2020-01-24 12:34:50 +00:00
dbf1c9a02a
Apparently i18n...
2020-01-24 12:34:03 +00:00
688f7029d2
Split AsyncWrapper out from Modal
...
So we can use it outside of modals & dialogs
2020-01-24 12:28:03 +00:00
a6fcbcacf6
Seperates out the padlock icon, and adds a tooltip
...
Fixes https://github.com/vector-im/riot-web/issues/11840
2020-01-24 12:06:21 +00:00
f4e5b69aa3
Merge branch 'origin/develop' into Weblate.
2020-01-24 11:24:39 +00:00
b66154330c
Merge pull request #3927 from matrix-org/bwindels/fixverifyowndevice
...
Fix verifying your own devices with to_device messages
2020-01-24 11:24:33 +00:00
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
Weblate