Commit graph

20816 commits

Author SHA1 Message Date
Weblate
d2ff9b1abc Merge branch 'origin/develop' into Weblate. 2020-01-21 18:11:41 +00:00
Zoe
0809d7dcba
Merge pull request #3875 from matrix-org/zip/11880-message-shields
Verify individual messages via cross-signing
2020-01-21 18:11:36 +00:00
Weblate
2e94919236 Merge branch 'origin/develop' into Weblate. 2020-01-21 18:09:31 +00:00
Travis Ralston
5cb0dc41b7
Merge pull request #3882 from matrix-org/travis/fix-tests
Fix layering of dependencies in riot-web and e2e tests
2020-01-21 11:09:27 -07:00
Michael Telatynski
7b26067397 delint 2020-01-21 18:03:01 +00:00
Travis Ralston
708f62784f
Consistency
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-21 10:59:33 -07:00
Michael Telatynski
e455aa474d improve copy further 2020-01-21 17:58:53 +00:00
Michael Telatynski
a8df058ea6 tidy up, improve wording on modal 2020-01-21 17:54:27 +00:00
Travis Ralston
33220c2d72 Ensure generated files are present for riot-web tests 2020-01-21 10:53:17 -07:00
Weblate
36329495bb Merge branch 'origin/develop' into Weblate. 2020-01-21 17:36:37 +00:00
catborise
931c0885de Translated using Weblate (Turkish)
Currently translated at 70.7% (1440 of 2038 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-21 17:36:36 +00:00
Michael Telatynski
587ff6ad75
Merge pull request #3844 from matrix-org/t3chguy/roving
Implement Roving Tab Index and Room List as TreeView
2020-01-21 17:36:30 +00:00
Zoe
2480f709b3 E2ESTATE -> E2E_STATE 2020-01-21 17:19:10 +00:00
Michael Telatynski
9f7df33bc3 re-arrange to split the async task into two and only wait on the user-blocking one 2020-01-21 16:57:07 +00:00
Weblate
d0ebea044c Merge branch 'origin/develop' into Weblate. 2020-01-21 16:56:14 +00:00
Zoe
ec714283ca
Merge pull request #3888 from matrix-org/zip/11833-overlay-shields
Move room header shields over the avatar for the room
2020-01-21 16:56:09 +00:00
Weblate
2067c6bc02 Merge branch 'origin/develop' into Weblate. 2020-01-21 16:52:25 +00:00
J. Ryan Stinnett
2d8f33e9ee
Merge pull request #3890 from matrix-org/jryans/clipped-shield
Fix toast icon to prevent clipping
2020-01-21 16:52:19 +00:00
Weblate
5926fa7d9d Merge branch 'origin/develop' into Weblate. 2020-01-21 16:52:14 +00:00
J. Ryan Stinnett
d6b6a4cdfa
Merge pull request #3889 from matrix-org/jryans/hide-verif-unless-e2e
Only show devices and verify actions in E2EE rooms
2020-01-21 16:52:08 +00:00
Michael Telatynski
b34fe45518 First attempt. Has a lag issue due to the async-clear :( 2020-01-21 16:50:04 +00:00
Michael Telatynski
060938379a Fix changes after typing / at pos=0 allowing to cancel command 2020-01-21 15:58:51 +00:00
Michael Telatynski
b5e902e1f2 Fix escaping commands using double-slash //, e.g //plain sends /plain 2020-01-21 15:55:21 +00:00
Michael Telatynski
9a530a72f6 delint 2020-01-21 15:36:25 +00:00
Michael Telatynski
b2aba6db35 Initial attempt to make toggleInlineFormat paragraph-aware 2020-01-21 15:32:32 +00:00
J. Ryan Stinnett
790d2c1472 Fix toast icon to prevent clipping
This fixes the bottom and right edges of the toast icon, which were getting
clipped away.

Fixes https://github.com/vector-im/riot-web/issues/11915
2020-01-21 15:30:03 +00:00
J. Ryan Stinnett
9c0cf326c1 Only show devices and verify actions in E2EE rooms
This changes logic to only show the devices list and verify button in E2EE
rooms, matching the design.

Fixes https://github.com/vector-im/riot-web/issues/11839
2020-01-21 15:13:03 +00:00
Weblate
34ba7a728e Merge branch 'origin/develop' into Weblate. 2020-01-21 13:44:26 +00:00
J. Ryan Stinnett
224528afd4
Merge pull request #3887 from matrix-org/jryans/user-verif-mismatch
Change user info verification checks to use cross-signing
2020-01-21 13:44:22 +00:00
Zoe
c8a2f6a5a0 Move room header shields over the avatar for the room
Currently this is calibrated like the lil' DM icon is
2020-01-21 13:33:16 +00:00
Weblate
adb1f8414d Merge branch 'origin/develop' into Weblate. 2020-01-21 13:15:43 +00:00
Michael Telatynski
ddfed32ea9
Merge pull request #3886 from matrix-org/t3chguy/insert_mention_colon
Fix click-to-ping not inserting colon if composer non-empty
2020-01-21 13:15:38 +00:00
J. Ryan Stinnett
b3d56b378e Use cross-signing verification only for own devices
The device verification checks are slightly more nuanced: we want to use
stricter cross-signing checks for your own devices to encourage everyone to
trust their devices via cross-signing so that other users can in turn trust
them.

However, for other users, it's okay to use the looser verification check that
also includes locally verified devices.
2020-01-21 12:03:52 +00:00
J. Ryan Stinnett
a7231d7336 New session toast should check cross-signing verification
To ensure all your sessions are cross-signing verified, we use the more specific
test for only that kind of verification in the new session toast.
2020-01-21 11:33:14 +00:00
Michael Telatynski
f56a9d246f Fix index for _insertMention 2020-01-21 11:13:08 +00:00
Weblate
6ee6bed1f1 Merge branch 'origin/develop' into Weblate. 2020-01-21 11:01:44 +00:00
Michael Telatynski
adec308529
Merge pull request #3884 from matrix-org/t3chguy/emoji_space_complete
Fix emoticon space completion for upper case emoticons like :D xD
2020-01-21 11:01:40 +00:00
J. Ryan Stinnett
8a00ff7f1f Change all user info verification checks to cross-signing
This fixes some user vs. device verification confusion in user info by changing
all the verification tests to the cross-signing variant when the lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11886
2020-01-21 11:00:40 +00:00
Weblate
7bc0abf01d Merge branch 'origin/develop' into Weblate. 2020-01-21 10:56:19 +00:00
J. Ryan Stinnett
ff8ee5cc7d
Merge pull request #3880 from matrix-org/jryans/repair-cs-panel
Repair cross-signing panel with async status
2020-01-21 10:56:13 +00:00
Weblate
bb0adb1c64 Merge branch 'origin/develop' into Weblate. 2020-01-21 10:33:27 +00:00
catborise
b5d5f4e13a Translated using Weblate (Turkish)
Currently translated at 70.0% (1428 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-21 10:33:27 +00:00
Makoto Kato
46f2c1f29b Translated using Weblate (Japanese)
Currently translated at 60.1% (1226 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-01-21 10:33:26 +00:00
Szimszon
21dea18985 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-21 10:33:26 +00:00
Kévin C
961f52924e Translated using Weblate (French)
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-21 10:33:25 +00:00
Jeff Huang
996d0f1d20 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-21 10:33:25 +00:00
J. Ryan Stinnett
8b2adf313f
Merge pull request #3878 from matrix-org/jryans/hide-extra-backup
Remove temporary key backup button
2020-01-21 10:33:19 +00:00
Michael Telatynski
26bba4416b Fix emoticon space completion for upper case emoticons like :D xD 2020-01-21 10:12:23 +00:00
Zoe
d34f1e52ad constants for e2estates 2020-01-21 10:08:53 +00:00
Travis Ralston
3b2f96bc04 Try explicitly mapping the directory 2020-01-20 18:02:54 -07:00