OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,755 Commits
219 Branches
563 Tags
479 MiB
Commit Graph

20755 Commits (8218962c37308c472989372e5343fb1f63e113f2)

Author SHA1 Message Date
Szimszon 942b391d8e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-17 15:43:28 +00:00
David Baker 6beae0ed39
Merge pull request #3862 from matrix-org/dbkr/catch_exception_cancel_passphrase 
Catch exception if passphrase dialog cancelled
 2020-01-17 15:43:21 +00:00
Bruno Windels a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels 5556cb5749 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-17 16:02:51 +01:00
Bruno Windels d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
David Baker d69c5f6a1b Catch exception if passphrase dialog cancelled 
As hopefully explained by comment
 2020-01-17 14:46:20 +00:00
Weblate bba11c2862 Merge branch 'origin/develop' into Weblate. 2020-01-17 14:24:29 +00:00
J. Ryan Stinnett 1a6be3addd
Merge pull request #3860 from matrix-org/jryans/disable-key-request 
Disable key request dialogs with cross-signing
 2020-01-17 14:24:23 +00:00
Weblate 4ef116b3ce Merge branch 'origin/develop' into Weblate. 2020-01-17 14:17:28 +00:00
David Baker a525ba57c7
Merge pull request #3859 from matrix-org/dbkr/new_session_toast 
Toasts for new, unverified sessions
 2020-01-17 14:17:22 +00:00
Weblate 0cbb71894b Merge branch 'origin/develop' into Weblate. 2020-01-17 14:09:11 +00:00
David Baker 3a29a5e66c
Merge pull request #3861 from matrix-org/dbkr/suppress_integrationmanagers_error 
Check for a matrixclient before trying to use it
 2020-01-17 14:09:05 +00:00
David Baker 42fe69aec9 Don't check devices if crypto is disabled 2020-01-17 14:08:37 +00:00
J. Ryan Stinnett 9b64686041 Add missing import 2020-01-17 13:50:24 +00:00
Weblate 0de10a6b30 Merge branch 'origin/develop' into Weblate. 2020-01-17 13:50:05 +00:00
Szimszon 5e4dab1f15 Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2026 of 2032 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-17 13:50:05 +00:00
Zoe 264ca1ecba
Merge pull request #3850 from matrix-org/zip/11225-shields-distinguish-encrypt-from-verify 
Room header & message box shields now reflect cross-signing state
 2020-01-17 13:49:59 +00:00
David Baker 066a01ae94 Check for a matrixclient before trying to use it 
Was being caught by the try block but still logging an error to the
console unnecessarily: we should not expect there to necessarily
be a matrix client since we run this from the constructor and
there's a shared instance which could be constructed at any point.
 2020-01-17 13:35:51 +00:00
J. Ryan Stinnett fb9962b08e Disable key request dialogs with cross-signing 
Cross-signing verification is meant to replace the old key share between devices
flow. This disables it when the cross-signing lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11904
 2020-01-17 13:09:10 +00:00
David Baker 9e43abaf3a Toasts for new, unverified sessions 
Fixes https://github.com/vector-im/riot-web/issues/11218
 2020-01-17 11:43:35 +00:00
Zoe 908630c0d9 *rude grumbling noises about @dbkr* 2020-01-17 11:30:45 +00:00
Zoe d02185e4af whoops, the number of unverified users matters to the logic 2020-01-17 10:22:53 +00:00
Zoe 510b08c88b changed logic to reflect the task 2020-01-17 10:18:50 +00:00
Weblate 154cb372c1 Merge branch 'origin/develop' into Weblate. 2020-01-17 10:16:52 +00:00
Kévin C 8e11389820 Translated using Weblate (French) 
Currently translated at 100.0% (2032 of 2032 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-17 10:16:52 +00:00
Jeff Huang 15e5552507 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2028 of 2028 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-17 10:16:50 +00:00
Michael Telatynski e88f062f01
Merge pull request #3857 from matrix-org/t3chguy/Array.concat 
Fix Array.concat undefined
 2020-01-17 10:16:43 +00:00
Michael Telatynski 9877fd9e85
Fix Array.concat undefined 2020-01-17 10:04:38 +00:00
Zoe 8efc45b31a no need to verify our own devices for every room 2020-01-17 10:04:34 +00:00
Weblate 84e61f9bf6 Merge branch 'origin/develop' into Weblate. 2020-01-16 22:46:06 +00:00
Travis Ralston 491cef4f92
Merge pull request #3856 from matrix-org/travis/fix-reskindex 
Update chokidar to fix reskindex not working
 2020-01-16 15:46:01 -07:00
Travis Ralston f535fdbcaa Update chokidar to fix reskindex not working 
The major version bump doesn't appear to affect us. It wasn't working before on Windows, but now it is.
 2020-01-16 15:39:07 -07:00
Weblate 4bf6940708 Merge branch 'origin/develop' into Weblate. 2020-01-16 22:06:58 +00:00
Travis Ralston 8cdce8fee0
Merge pull request #3854 from matrix-org/travis/ftue/user-lists/6.1-multidialog 
Make the new DM invite dialog work for regular invites too
 2020-01-16 15:06:52 -07:00
Weblate e2ac441c67 Merge branch 'origin/develop' into Weblate. 2020-01-16 22:05:55 +00:00
J. Ryan Stinnett 576434e8c8
Merge pull request #3855 from matrix-org/jryans/custom-status-leak 
Fix event handler leak in MemberStatusMessageAvatar
 2020-01-16 22:05:50 +00:00
Weblate 5aa6bc8565 Merge branch 'origin/develop' into Weblate. 2020-01-16 22:05:14 +00:00
Travis Ralston d5eb011f48
Merge pull request #3843 from matrix-org/travis/ftue/user-lists/5.3-go-button 
Move DM creation logic into DMInviteDialog
 2020-01-16 15:05:09 -07:00
Weblate 5227b7912c Merge branch 'origin/develop' into Weblate. 2020-01-16 22:03:46 +00:00
Travis Ralston 43f97af805
Merge pull request #3848 from matrix-org/travis/fix-cut 
Remove all text when cutting in the composer
 2020-01-16 15:03:41 -07:00
J. Ryan Stinnett 03448313e6 Fix event handler leak in MemberStatusMessageAvatar 
A typo led to an event handler leak with the custom status labs feature. A new
handler would leak each time you change rooms, which can add up over the course
of a long-lived session.
 2020-01-16 21:52:36 +00:00
Travis Ralston e42663fc62 Appease the linter 2020-01-16 14:45:17 -07:00
Travis Ralston 1a961358f0 Don't show recents and suggestions for users already in the room 2020-01-16 14:40:25 -07:00
Travis Ralston f350167408 Support using the InviteDialog for both DMs and invites 
For https://github.com/vector-im/riot-web/issues/11201
 2020-01-16 14:40:12 -07:00
Travis Ralston 73fc91aa20 Rename feature flag for use in both code paths 2020-01-16 13:44:59 -07:00
Travis Ralston 7da9e0582f Rename DMInviteDialog to be a generic Invite Dialog 2020-01-16 13:42:34 -07:00
Travis Ralston 5380651c84 Merge branch 'travis/ftue/user-lists/5.3-go-button' into travis/ftue/user-lists/6.1-multidialog 2020-01-16 13:38:39 -07:00
Travis Ralston 372861c9df Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button 2020-01-16 13:36:59 -07:00
Weblate c571558331 Merge branch 'origin/develop' into Weblate. 2020-01-16 20:35:00 +00:00
catborise fa0d712773 Translated using Weblate (Turkish) 
Currently translated at 65.9% (1336 of 2026 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-16 20:35:00 +00:00