mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-24 03:35:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
20687 commits 204 branches 547 tags 600 MiB
Commit graph

20687 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Szimszon
45dea0152f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2026 of 2026 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-16 20:34:55 +00:00
David Baker
cf426b5cf3
Merge pull request #3853 from matrix-org/dbkr/toaststore 
Add a ToastStore
 2020-01-16 20:34:49 +00:00
David Baker
83b1505401 Add a ToastStore 
To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
 2020-01-16 20:23:47 +00:00
Travis Ralston
d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Weblate
5068d82488 Merge branch 'origin/develop' into Weblate. 2020-01-16 17:11:30 +00:00
Travis Ralston
3ed7beac78
Merge pull request #3804 from matrix-org/t3chguy/rightpanel 
'Members' button always toggle the right panel
 2020-01-16 10:11:24 -07:00
Travis Ralston
cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski
0f61aa57ff
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-16 17:00:04 +00:00
Weblate
86715638ad Merge branch 'origin/develop' into Weblate. 2020-01-16 16:54:41 +00:00
Travis Ralston
64c4677699
Merge pull request #3842 from matrix-org/t3chguy/fix_isModified 
Fix timing of when Composer considers itself to be modified
 2020-01-16 09:54:36 -07:00
Weblate
557d8b0ee1 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:53:30 +00:00
J. Ryan Stinnett
e375b1d31f
Merge pull request #3851 from matrix-org/jryans/download-file-icon 
Compute download file icon immediately
 2020-01-16 16:53:25 +00:00
Weblate
ca4d926867 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:47:23 +00:00
Travis Ralston
564a30b7be
Merge pull request #3852 from matrix-org/travis/fix-member-avatar 
Fix not being able to open profiles from the timeline
 2020-01-16 09:47:17 -07:00
Travis Ralston
4ea2a2fee4 Merge branch 'develop' into t3chguy/fix_isModified 2020-01-16 09:46:28 -07:00
Weblate
4e6e10ecc4 Merge branch 'origin/develop' into Weblate. 2020-01-16 16:42:33 +00:00
random
f8d12b11f5 Translated using Weblate (Italian) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-16 16:42:33 +00:00
Kévin C
086b3f811e Translated using Weblate (French) 
Currently translated at 100.0% (2018 of 2018 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-16 16:42:30 +00:00