Commit Graph

16178 Commits (808785c2f89dec842e727601ebc5dd5624eb21c1)

Author SHA1 Message Date
Will Hunt b1c2887087
line length 2019-12-30 16:08:24 +00:00
j 9eed423994 support channel names with slash in name/alias
Signed-off-by: Jan Gerber <j@mailb.org>
2019-12-29 12:10:31 +01:00
Michael Telatynski 4489b5a21a Escape HTML in og:description and render any html &-encoded entities 2019-12-28 20:05:55 +00:00
Michael Telatynski 705bfcd20d fix RoomViewStore import in UserInfo 2019-12-28 17:54:46 +00:00
Michael Telatynski a0cb6ce302 User Info fetch latest RoomMember instead of showing historical data 2019-12-28 17:51:38 +00:00
Weblate dc607fbda9 Merge branch 'origin/develop' into Weblate. 2019-12-27 18:37:44 +00:00
Travis Ralston 98571d706f Fix NPE when searching for rooms
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
2019-12-27 11:31:15 -07:00
Weblate 737e049af2 Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:31 +00:00
Michael Telatynski e9658a9e9e
Merge pull request #3782 from matrix-org/t3chguy/room_settings_alias_input
Turn RoomAliasField into properly controlled and use in RoomSettings
2019-12-27 17:19:26 +00:00
Weblate bab89fbfaf Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:25 +00:00
random 957b1efc00 Translated using Weblate (Italian)
Currently translated at 99.9% (2000 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-27 17:19:25 +00:00
Michael Telatynski eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist
fuzzy-sort MemberList
2019-12-27 17:19:19 +00:00
Michael Telatynski aa990462ce delint 2019-12-27 17:05:51 +00:00
Michael Telatynski f9e386adaa Improve SORT_REGEX 2019-12-27 17:04:14 +00:00
Weblate 85159c3651 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:58:47 +00:00
Michael Telatynski c79bd791d6
Merge pull request #3786 from matrix-org/t3chguy/serialize_file_uploads
Serialize file uploads into room to match confirmation dialog order
2019-12-27 16:58:42 +00:00
Weblate b19cb2df10 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:53:01 +00:00
Michael Telatynski 05911881c2
Merge pull request #3785 from matrix-org/t3chguy/search_unread_messages
Do not show Top Unread Messages Bar and Jump to bottom button if searching
2019-12-27 16:52:56 +00:00
Weblate 008a394af2 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:52:51 +00:00
Michael Telatynski 2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset
Fix sticker picker chevron offset calculation
2019-12-27 16:52:46 +00:00
Weblate 7f2a13d47b Merge branch 'origin/develop' into Weblate. 2019-12-27 16:52:29 +00:00
Michael Telatynski 4984dd6f92
Merge pull request #3781 from matrix-org/t3chguy/user_info
Fix not being able to promote others to the same power level as your own
2019-12-27 16:52:23 +00:00
Weblate a2104972a3 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:50:32 +00:00
strix aluco 145741d168 Translated using Weblate (Ukrainian)
Currently translated at 27.1% (542 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2019-12-27 16:50:31 +00:00
Stanislav Lukeš 6f7ddc3713 Translated using Weblate (Czech)
Currently translated at 98.8% (1976 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-12-27 16:50:31 +00:00
Michael Telatynski 9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot
Room Tile DMs online/active green dot
2019-12-27 16:50:21 +00:00
Michael Telatynski 9f948b5da3 Serialize file uploads into room to match confirmation dialog order 2019-12-27 13:59:57 +00:00
Michael Telatynski e9ebfa100f Do not show Top Unread Messages Bar and Jump to bottom button if searching 2019-12-26 20:32:25 +00:00
Michael Telatynski ed24f19a3f Fix stick picker chevron offset calculation 2019-12-26 20:12:50 +00:00
Michael Telatynski ab12288979 Add more punctuation to regex 2019-12-26 19:29:25 +00:00
Michael Telatynski e320f64ba1 fuzzy-sort MemberList 2019-12-26 19:27:04 +00:00
Michael Telatynski ebf7eb698d Turn RoomAliasField into properly controlled and use in RoomSettings 2019-12-26 18:52:57 +00:00
Michael Telatynski e95b67e101 Only show it if exactly 2 members, until we get Canonical DMs 2019-12-26 18:15:08 +00:00
Michael Telatynski 22fe0add3c Make UserOnlineDot more generic 2019-12-26 18:14:46 +00:00
ferhad.necef c1c0c36008 Translated using Weblate (Azerbaijani)
Currently translated at 22.4% (448 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2019-12-26 18:05:53 +00:00
Michael Telatynski 73800c9a92 Fix UserInfo promote user inverted buttons 2019-12-26 18:04:58 +00:00
Weblate 2a36bdf1eb Merge branch 'origin/develop' into Weblate. 2019-12-25 22:16:28 +00:00
catborise 7043453d3e Translated using Weblate (Turkish)
Currently translated at 44.7% (894 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-25 22:16:27 +00:00
ferhad.necef a0e816d134 Translated using Weblate (Russian)
Currently translated at 90.8% (1816 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-12-25 22:16:19 +00:00
Szimszon 5e4f341cd8 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/
2019-12-25 22:16:18 +00:00
Samu Voutilainen b8dbd32363 Translated using Weblate (Finnish)
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/fi/
2019-12-25 22:16:18 +00:00
Jeff Huang b4a569dfc7 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/
2019-12-25 22:16:15 +00:00
ferhad.necef abb5ea2df8 Translated using Weblate (Azerbaijani)
Currently translated at 22.3% (447 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2019-12-25 22:16:15 +00:00
Travis Ralston 92ea1157be Reintroduce working resizer code for right panel
Fixes https://github.com/vector-im/riot-web/issues/11674

This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93

We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
2019-12-23 19:26:59 -07:00
Weblate 602aee02f6 Merge branch 'origin/develop' into Weblate. 2019-12-23 19:40:08 +00:00
Michael Telatynski 25d864c39d Fix wrong scope binding on openHelp for TopLeftMenu 2019-12-23 19:29:43 +00:00
Weblate 6a148050e3 Merge branch 'origin/develop' into Weblate. 2019-12-23 18:33:11 +00:00
Michael Telatynski 23b9b98f7b
Merge pull request #3774 from matrix-org/t3chguy/userinfo_tweaks
UserInfo hide kick/mute buttons if they make no sense
2019-12-23 18:33:05 +00:00
Michael Telatynski 0497ef228d UserInfo hide kick/mute buttons if they make no sense 2019-12-23 18:20:59 +00:00
Weblate 746522358f Merge branch 'origin/develop' into Weblate. 2019-12-23 18:10:56 +00:00
Kévin C 178dbdca5b 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/
2019-12-23 18:10:56 +00:00
Michael Telatynski 659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup
Fix duplicate Incoming Call prompt on Community Invite sublist
2019-12-23 18:10:51 +00:00
Michael Telatynski e552195701 Fix duplicate Incoming Call prompt on Community Invite sublist 2019-12-23 17:57:53 +00:00
Weblate 566e825e0b Merge branch 'origin/develop' into Weblate. 2019-12-23 17:18:13 +00:00
Michael Telatynski 6e9791c950
Merge pull request #3755 from matrix-org/t3chguy/tags_changes
Apply new design to highlighted tags and add toggle mechanic
2019-12-23 17:18:07 +00:00
Weblate da37d02215 Merge branch 'origin/develop' into Weblate. 2019-12-23 17:16:53 +00:00
Michael Telatynski 1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 17:16:47 +00:00
Weblate 398f772e6c Merge branch 'origin/develop' into Weblate. 2019-12-23 17:16:11 +00:00
catborise 131ecfe912 Translated using Weblate (Turkish)
Currently translated at 36.8% (736 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-23 17:16:11 +00:00
random 4d61e0bbe7 Translated using Weblate (Italian)
Currently translated at 99.9% (1999 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-23 17:16:07 +00:00
Samu Voutilainen e47ac5fbb5 Translated using Weblate (Finnish)
Currently translated at 97.0% (1940 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-12-23 17:16:06 +00:00
Michael Telatynski 1da55c530b
Merge pull request #3772 from matrix-org/t3chguy/alts
Add alt="" to presentational images
2019-12-23 17:15:58 +00:00
Michael Telatynski 8018097e56 Add alt="" to presentational images 2019-12-23 14:13:56 +00:00
Michael Telatynski 207045e979 fix ReadReceiptMarker ref 2019-12-23 12:54:31 +00:00
Michael Telatynski 17f5849985 stop using ReactDOM.findDOMNode in componentWillUnmount, use refs 2019-12-23 12:24:49 +00:00
Michael Telatynski 661701f7ca Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes
 Conflicts:
	src/components/views/elements/TagTile.js
2019-12-23 11:00:42 +00:00
Weblate 245d83af43 Merge branch 'origin/develop' into Weblate. 2019-12-21 20:59:35 +00:00
Michael Telatynski 0b62f8a62f
Merge pull request #3759 from matrix-org/t3chguy/fix_room_list_filtering
Fix room list filtering weird case sensitivity
2019-12-21 20:59:29 +00:00
Michael Telatynski 24a1017d6d
Fix typo in comment 2019-12-21 20:26:32 +00:00
Weblate 69a077df29 Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:10 +00:00
Weblate 652998245c Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:08 +00:00
catborise 3dcef53b93 Translated using Weblate (Turkish)
Currently translated at 33.8% (677 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-21 17:41:08 +00:00
Peter Vágner 9a51b41846 Translated using Weblate (Slovak)
Currently translated at 77.8% (1556 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-12-21 17:41:03 +00:00
Szimszon fef19c510c Translated using Weblate (Hungarian)
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-21 17:40:59 +00:00
Kévin C 0e7949d73e Translated using Weblate (French)
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-21 17:40:57 +00:00
Jeff Huang 21dcf65858 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-21 17:40:57 +00:00
Michael Telatynski e936f7eb09 Fix room list filtering weird case sensitivity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-21 11:13:37 +00:00
David Baker 376bf7e213 i18n 2019-12-20 16:56:38 +00:00
David Baker a928b33f27 Don't show the 'verify' button if the user is verified
Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
2019-12-20 16:51:50 +00:00
David Baker b998e6ffe8 Switch to using checkDeviceTrust
In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!

Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
2019-12-20 11:31:11 +00:00
Michael Telatynski 3a36d61fab delint 2019-12-19 21:10:22 +00:00
Michael Telatynski d9ea9b4ad3 Iterate to match design on Zeplin 2019-12-19 20:53:34 +00:00
Weblate 970f16df3d Merge branch 'origin/develop' into Weblate. 2019-12-19 20:32:18 +00:00
Michael Telatynski 24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts
Migrate away from React Legacy contexts API
2019-12-19 20:32:11 +00:00
Weblate 5914553718 Merge branch 'origin/develop' into Weblate. 2019-12-19 20:18:34 +00:00
David Baker a21fdb17fd
Merge pull request #3749 from matrix-org/dbkr/keybackup_migrate
Migrate key backups to SSSS
2019-12-19 20:18:28 +00:00
Michael Telatynski b2249d0561 Initial rejig 2019-12-19 20:09:05 +00:00
David Baker b98058fc3c Add bug for removing temporary srceen 2019-12-19 19:54:44 +00:00
David Baker 822762f014 add todo 2019-12-19 19:49:36 +00:00
Weblate 93c252fd02 Merge branch 'origin/develop' into Weblate. 2019-12-19 19:25:57 +00:00
Kévin C 372512b0c4 Translated using Weblate (French)
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-19 19:25:57 +00:00
Michael Telatynski a410cc004f
Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data
Get rid of stripped-emoji.json in favour of an in-memory single source of truth
2019-12-19 19:25:50 +00:00
David Baker 48b166f451 Pass the key backup into the right thing 2019-12-19 17:28:32 +00:00
Weblate f716f673a8 Merge branch 'origin/develop' into Weblate. 2019-12-19 17:27:46 +00:00
David Baker 290df9f50e
Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags
Combine cross signing and verification over DM feature flags
2019-12-19 17:27:41 +00:00
Michael Telatynski a25bc94343 remove unused, commented line of code 2019-12-19 17:22:02 +00:00
Weblate 86af43da6d Merge branch 'origin/develop' into Weblate. 2019-12-19 17:16:15 +00:00
Michael Telatynski ba2078e262
Merge pull request #3754 from matrix-org/t3chguy/fuzzy_filter_room_list
apply unhomoglyph when filtering room list to fuzzify it
2019-12-19 17:16:09 +00:00
Weblate 4ee879ec08 Merge branch 'origin/develop' into Weblate. 2019-12-19 16:58:40 +00:00
Michael Telatynski f3802bfd05
Merge pull request #3746 from matrix-org/t3chguy/emoji_picker
Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed
2019-12-19 16:58:34 +00:00
Michael Telatynski 1c31fd3413 Apply new design to highlighted tags and add toggle mechanic 2019-12-19 16:54:30 +00:00
Weblate f80d6e2877 Merge branch 'origin/develop' into Weblate. 2019-12-19 16:27:24 +00:00
Michael Telatynski a13ee490e8
Merge pull request #3750 from matrix-org/t3chguy/m_too_large
Internationalise M_TOO_LARGE error from Synapse
2019-12-19 16:27:17 +00:00
Michael Telatynski e54429680b tidy up 2019-12-19 15:28:11 +00:00
David Baker c5e7594fe9 i18n 2019-12-19 15:27:29 +00:00
Michael Telatynski 26980e2ad5 apply unhomoglyph when filtering room list to fuzzify it 2019-12-19 15:26:04 +00:00
David Baker 3d8422c88a Combine cross signing and verification over DM feature flags
This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
2019-12-19 15:23:32 +00:00
Michael Telatynski 709b2eed7c Add bunch of null-guards and similar to fix React Errors/complaints 2019-12-19 15:10:54 +00:00
Weblate 07761c6813 Merge branch 'origin/develop' into Weblate. 2019-12-19 14:39:24 +00:00
Peter Vágner 00b66b4877 Translated using Weblate (Slovak)
Currently translated at 75.0% (1498 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-12-19 14:39:23 +00:00
random 1010c0a27b Translated using Weblate (Italian)
Currently translated at 99.9% (1997 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-19 14:39:19 +00:00
Samu Voutilainen 3f7ea3bc66 Translated using Weblate (Finnish)
Currently translated at 95.5% (1909 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-12-19 14:39:17 +00:00
Michael Telatynski db069b9602 delint 2019-12-19 14:33:46 +00:00
Michael Telatynski 6c1944359e Add RoomTile online indicator to DMs 2019-12-19 14:29:46 +00:00
Michael Telatynski 3678e64f5d Internationalise M_TOO_LARGE error from Synapse 2019-12-19 13:25:43 +00:00
Michael Telatynski 66783dff9e Fix scaling of the avatar in UserInfo 2019-12-19 12:27:25 +00:00
David Baker 6851ad04b6 Migrate key backups to SSSS
If there's a key backup set up when we bootstrap SSSS, use its key
for SSSS and add the key backup key as a passthrough secret.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128
Fixes https://github.com/vector-im/riot-web/issues/11210
2019-12-19 11:26:20 +00:00
Michael Telatynski 3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic 2019-12-19 10:42:47 +00:00
Michael Telatynski a1df87a375 Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed 2019-12-19 07:23:05 +00:00
David Baker a5d5569af4 Translated using Weblate (Japanese)
Currently translated at 59.3% (1184 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2019-12-18 21:46:59 +00:00
Michael Telatynski d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
Weblate ce995d1a1e Merge branch 'origin/develop' into Weblate. 2019-12-17 17:39:47 +00:00
Michael Telatynski f30e919f9e
Merge pull request #3741 from matrix-org/t3chguy/dropdown_keyboard_propagation
Dropdown stop keyboard propagation if key handled
2019-12-17 17:39:41 +00:00
Michael Telatynski da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski b094f0fe47 delint 2019-12-17 17:31:29 +00:00
Michael Telatynski 937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Weblate 7811bd8859 Merge branch 'origin/develop' into Weblate. 2019-12-17 17:02:41 +00:00
Travis Ralston 1a44f01f0a
Merge pull request #3742 from matrix-org/travis/rp-memberinfo
Fix right panel for multiple member info viewings
2019-12-17 10:02:35 -07:00
Michael Telatynski 2e8d66fa36 Null-guard member mention pills for rooms you have left (notif panel) 2019-12-17 16:54:59 +00:00
Travis Ralston 16181ff0ed Fix right panel for multiple member info viewings
Fixes https://github.com/vector-im/riot-web/issues/11663

Member info is special because it has parameters associated with it. What was happening was the RightPanelStore was seeing that it was already on member info and deciding to hide the pane instead. What we do now is consider any phase change with parameters (such as the user to pass to member info) as a proper phase change.
2019-12-17 09:47:06 -07:00
Weblate 069129507f Merge branch 'origin/develop' into Weblate. 2019-12-17 16:45:54 +00:00
Michael Telatynski 3f5dc4fcdc
Merge pull request #3740 from matrix-org/t3chguy/field_validation_async_tooltip_sticks
Fix Field validation tooltip sticking if blurred before async validation resolved
2019-12-17 16:45:48 +00:00
Weblate 1d9d812b04 Merge branch 'origin/develop' into Weblate. 2019-12-17 15:14:04 +00:00
Michael Telatynski 7f78f55c94 Dropdown stop keyboard propagation if key handled 2019-12-17 15:14:01 +00:00
Michael Telatynski 0c89ab9fb5
Merge pull request #3738 from matrix-org/t3chguy/null-guard-useIsEncrypted
Fix UserInfo exploding without a room being passed to it
2019-12-17 15:13:59 +00:00
Weblate b4f9b88025 Merge branch 'origin/develop' into Weblate. 2019-12-17 15:07:19 +00:00
Travis Ralston 590ef79300
Merge pull request #3737 from matrix-org/travis/room-dir
Fix room directory maintaining and error state
2019-12-17 08:07:12 -07:00
Michael Telatynski 0e86c2648d improve comment 2019-12-17 14:36:20 +00:00
Michael Telatynski 213bc4c3ac Fix Field validation tooltip sticking if blurred before async validation resolved 2019-12-17 14:28:18 +00:00
Michael Telatynski c1133ebfc6 null-guard useIsEncrypted 2019-12-17 14:05:51 +00:00
Weblate c0f3db1678 Merge branch 'origin/develop' into Weblate. 2019-12-17 10:07:18 +00:00
Michael Telatynski 17463c401f post-merge fix 2019-12-17 09:58:04 +00:00
Weblate 285667d653 Merge branch 'origin/develop' into Weblate. 2019-12-17 09:55:22 +00:00
Szimszon a7a7a9cb23 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-17 09:55:22 +00:00
Jeff Huang 284a1fdde7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-17 09:55:21 +00:00
Michael Telatynski 3a8ab6ec2b
Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-17 09:55:13 +00:00
Travis Ralston b2a1a40961 Fix room directory maintaining and error state
Fixes https://github.com/vector-im/riot-web/issues/11665

We weren't clearing the error from a previous lookup, which effectively prevented the UI from working after an error happened.
2019-12-16 16:47:33 -07:00
Weblate b7e2acc5f0 Merge branch 'origin/develop' into Weblate. 2019-12-16 17:25:34 +00:00
Kévin C eb5ebaf754 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/
2019-12-16 17:25:34 +00:00
Michael Telatynski 3b0f8233e8 delint 2019-12-16 17:22:00 +00:00