David Baker
158bf3d1fa
Merge pull request #3863 from matrix-org/dbkr/catch_exception_checkterms
...
Catch exception in checkTerms if no ID server
2020-01-17 16:55:41 +00:00
David Baker
03cb76861f
Catch exception in checkTerms if no ID server
...
This line will throw if it can't get to the ID server, so move it
inside the catch block too.
2020-01-17 16:26:47 +00:00
Bruno Windels
716c8ba68f
pr feedback
2020-01-17 17:02:31 +01:00
Weblate
09e18be9f7
Merge branch 'origin/develop' into Weblate.
2020-01-17 15:43:28 +00:00
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
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
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
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
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
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
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
Samu Voutilainen
eb6c7ec275
Translated using Weblate (Finnish)
...
Currently translated at 98.5% (1988 of 2018 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-01-16 16:42:29 +00:00
J. Ryan Stinnett
89230395eb
Merge pull request #3847 from matrix-org/jryans/cross-signing-setup
...
Add post-login complete security flow
2020-01-16 16:42:23 +00:00
Travis Ralston
869fd0b2c9
Fix not being able to open profiles from the timeline
...
MemberAvatar was referencing the wrong dispatcher (it was imported as `dis`, like everywhere else, not `dispatcher`).
Fixes https://github.com/vector-im/riot-web/issues/11887
2020-01-16 09:40:11 -07:00
Zoe
82c5349c4e
Updated to properly handle logic
2020-01-16 16:31:50 +00:00
J. Ryan Stinnett
0dfd58c784
Compute download file icon immediately
...
Build process changes may have changed the load order, so this tintable is now
registered too late (after the theme is set).
Fixes https://github.com/vector-im/riot-web/issues/11881
2020-01-16 14:00:48 +00:00
J. Ryan Stinnett
5926e277c4
Avoid logged in event race
2020-01-16 11:52:02 +00:00
Zoe
9ac3cb6fd0
Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify
2020-01-16 11:23:57 +00:00
Zoe
ff05041a5a
Update room shield icons to represent encrypted but unverified chats in less alarmed tones
2020-01-16 11:10:23 +00:00
Travis Ralston
1b4ab856c9
Assume the position is at the end when the offset has no last part
...
We get an NPE when the user cuts their entire message, and this fixes it.
2020-01-15 21:05:00 -07:00
Travis Ralston
b137cd21d3
Replace the selected range instead of force-setting it
...
This gives people the option of cutting parts or all of their message.
2020-01-15 21:04:18 -07:00
Michael Telatynski
4504d9b790
add tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 03:15:52 +00:00
Travis Ralston
be3ef2b50e
Remove all text when cutting in the composer
...
The previous function did in fact remove the elements, but left the model thinking there was a zero-length string. This approach deletes the text from the model and the DOM, resulting in the placeholder being shown when cutting all the text.
Part of https://github.com/vector-im/riot-web/issues/11378
2020-01-15 19:08:14 -07:00
Michael Telatynski
2230b7732a
rearrange
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 01:45:16 +00:00
Michael Telatynski
781db63fa6
split out home/end handling into a helper as not all roving-tab-index widgets want it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 01:35:42 +00:00
Michael Telatynski
8c1fdf4cab
tidy up
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 01:25:44 +00:00
Michael Telatynski
2b37fe7624
do some renaming
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 00:40:08 +00:00
Michael Telatynski
e6ab18c9ba
Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving
...
Conflicts:
src/components/views/rooms/RoomList.js
2020-01-16 00:31:43 +00:00
Weblate
e3ca5e5061
Merge branch 'origin/develop' into Weblate.
2020-01-15 22:36:41 +00:00
Alexey Murz Korepov
ed9bce21f5
Translated using Weblate (Russian)
...
Currently translated at 89.1% (1798 of 2018 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-01-15 22:36:40 +00:00
Szimszon
3afa2b1d5b
Translated using Weblate (Hungarian)
...
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/hu/
2020-01-15 22:36:40 +00:00
Travis Ralston
cad9562f8d
Merge pull request #3828 from krkc/develop
...
Added cut/copy and pasting user pills from editor.
2020-01-15 15:36:33 -07:00
J. Ryan Stinnett
71fa3222fe
Fix component index import
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-15 22:11:22 +00:00
J. Ryan Stinnett
6e027badc0
Tweak comparison
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-15 22:10:59 +00:00
J. Ryan Stinnett
27ee90cad5
Add post-login complete security flow
...
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.
This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.
Fixes https://github.com/vector-im/riot-web/issues/11214
2020-01-15 21:53:36 +00:00
Weblate
e96d02e5c0
Merge branch 'origin/develop' into Weblate.
2020-01-15 19:44:41 +00:00
Osoitz
6f351ed225
Translated using Weblate (Basque)
...
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/eu/
2020-01-15 19:44:41 +00:00
Travis Ralston
dd88809622
Fix imports for help & support tab
...
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
2020-01-15 12:02:34 -07:00
Weblate
66750641a8
Merge branch 'origin/develop' into Weblate.
2020-01-15 17:58:36 +00:00
Travis Ralston
d763d7e633
Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n
2020-01-15 10:49:38 -07:00
Weblate
954b45d12a
Merge branch 'origin/develop' into Weblate.
2020-01-15 17:49:04 +00:00
Travis Ralston
0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions
...
Improve the quality of invite suggestions by filtering out DMs
2020-01-15 10:49:00 -07:00
Weblate
ac0ee20d2c
Merge branch 'origin/develop' into Weblate.
2020-01-15 17:11:44 +00:00
Kévin C
a9d5c7e720
Translated using Weblate (French)
...
Currently translated at 100.0% (2004 of 2004 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-15 17:11:44 +00:00
Jeff Huang
c74dc2c870
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2004 of 2004 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-15 17:11:43 +00:00
Osoitz
93b9bf1647
Translated using Weblate (Basque)
...
Currently translated at 100.0% (2004 of 2004 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-01-15 17:11:42 +00:00
Travis Ralston
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
...
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
Michael Telatynski
dedf1eab31
Iterate to get rid of the magic group and just provide a generic functional render wrapper
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 11:37:14 +00:00
Travis Ralston
8b6a5d37aa
Remove simulated error state used for screenshot
2020-01-14 23:35:45 -07:00
Travis Ralston
b9852c7264
Appease the linter
2020-01-14 23:35:07 -07:00
Travis Ralston
443744733d
Move DM creation logic into DMInviteDialog
...
Fixes https://github.com/vector-im/riot-web/issues/11645
The copy hasn't been reviewed by anyone and could probably use some work.
2020-01-14 23:32:00 -07:00
Michael Telatynski
5252cf4c45
Implement roving tab index context based magic thing and demo on LeftPanel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 02:44:22 +00:00
Michael Telatynski
23633abc10
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving
2020-01-15 00:34:27 +00:00
Michael Telatynski
d37c19d785
Fix timing of when Composer considers itself to be modified
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 00:27:54 +00:00
Michael Telatynski
5a5a0d2233
Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel
2020-01-15 00:03:18 +00:00
Weblate
50f73ee0c5
Merge branch 'origin/develop' into Weblate.
2020-01-14 17:12:20 +00:00
David Baker
fa174512cc
Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
...
Don't error on unverified/unknown devices.
2020-01-14 17:12:14 +00:00
Weblate
3ac64244f8
Merge branch 'origin/develop' into Weblate.
2020-01-14 14:15:52 +00:00
Zoe
1fd1e4b953
Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons
...
Padlock icons in room header (behind feature_cross_signing)
2020-01-14 14:15:46 +00:00
Weblate
8c769a9a80
Merge branch 'origin/develop' into Weblate.
2020-01-14 12:18:08 +00:00
Szimszon
b556208014
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-14 12:18:08 +00:00
Kévin C
1542ea75c9
Translated using Weblate (French)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-14 12:18:08 +00:00
Jeff Huang
1aec215624
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-14 12:18:07 +00:00
David Baker
f87541a6a9
Merge pull request #3822 from matrix-org/dbkr/key_backup_resign
...
Don't allow upgrade from untrusted key backup.
2020-01-14 12:18:00 +00:00
David Baker
24552f567e
Add primary button to trigger restore flow
2020-01-14 11:52:00 +00:00
David Baker
c91af5ae49
i18n
2020-01-14 11:33:16 +00:00
David Baker
94e4d5bf1f
s/sign-in/session/
2020-01-14 11:32:30 +00:00
David Baker
44ca35296a
Consistent capitalisation
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-14 11:31:00 +00:00
Zoe
f617fb7bbe
Place RoomHeader privacy padlocks behind the crosssigning feature flag
2020-01-14 10:31:01 +00:00
Travis Ralston
76183fc8fd
Appease the linter
2020-01-13 21:21:18 -07:00
Travis Ralston
b69b284efa
Humanize the recent DM rooms ourselves for translations
2020-01-13 21:20:01 -07:00
Travis Ralston
9188183c9b
Improve the quality of invite suggestions by filtering out DMs
...
This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
2020-01-13 21:04:13 -07:00
Travis Ralston
90c7535a69
Export VIEWS from MatrixChat for riot-web tests
2020-01-13 20:15:58 -07:00
David Baker
14501b748b
lint again
2020-01-13 21:58:26 +00:00
David Baker
9a1be1a24d
Don't try to set crypto options without crypto enabled
2020-01-13 21:54:14 +00:00
Weblate
612df68082
Merge branch 'origin/develop' into Weblate.
2020-01-13 21:33:07 +00:00
call_xz
ce85204937
Translated using Weblate (Japanese)
...
Currently translated at 59.5% (1190 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-01-13 21:33:07 +00:00
Szimszon
eeee736e9f
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-13 21:33:05 +00:00
J. Ryan Stinnett
9cedfeb007
Merge pull request #3825 from aaronraimist/lock
...
Emoji verification: Change name of 🔒 to lock
2020-01-13 21:32:58 +00:00
Travis Ralston
bf6798e109
Appease the linter
2020-01-13 13:28:33 -07:00
Travis Ralston
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07:00
David Baker
e47240d838
Lint Eastwood
2020-01-13 17:56:40 +00:00
David Baker
d53016e8fc
Room padlock decorations only if cross-signing is enabled
...
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
2020-01-13 17:53:49 +00:00
David Baker
76fe87c941
Don't error on unverifie/unknownd devices.
...
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).
Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
2020-01-13 17:41:58 +00:00
Zoe
397637d59d
used classnames module
2020-01-13 15:08:07 +00:00
Zoe
0bd2ecd798
lint
2020-01-13 14:51:10 +00:00
Zoe
e43174c636
Show padlock in room headers for invite-only rooms
...
Fixes #11832
2020-01-13 14:49:23 +00:00
Christopher
59ea865e8e
Added missing semicolon.
2020-01-13 14:29:42 +00:00
Michael Telatynski
66b55495bb
Fix right panel buttons highlighting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:40:45 +00:00
J. Ryan Stinnett
8fc85797a7
Guard against missing members in avatars
...
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:40:40 +00:00
J. Ryan Stinnett
dd652f6af3
Merge pull request #3832 from matrix-org/jryans/community-user-list-fire
...
Repair community member info panel
2020-01-13 12:38:24 +00:00
J. Ryan Stinnett
77b479d50c
Guard against missing members in avatars
...
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:29:10 +00:00
J. Ryan Stinnett
56a7b6c33e
Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator
...
Add feature flag around the presence indicator in room list
2020-01-13 12:25:00 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons
...
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
2020-01-13 12:20:32 +00:00
Michael Telatynski
9c686bf501
Fix right panel buttons highlighting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:15:54 +00:00
Zoe
878c5b5b52
removed unnecessary lint rule
2020-01-13 12:11:19 +00:00
J. Ryan Stinnett
2168e7ec0c
Add feature flag around the presence indicator in room list
...
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.
Part of https://github.com/vector-im/riot-web/issues/11799
2020-01-13 11:48:55 +00:00