20034 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Baker	23dffb69ac	Merge pull request #3795 from matrix-org/dbkr/key_backup_checkdevicetrust ... Use deviceTrust when displaying key backup trust status	2020-01-03 14:52:40 +00:00
David Baker	43e4f2dcc0	Use deviceTrust when displaying key backup trust status ... Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138	2020-01-03 13:34:43 +00:00
David Baker	bcece7dc10	Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed ... Don't crash if a keyshare request is removed	2020-01-03 13:08:47 +00:00
David Baker	b0ca8f24d4	Merge pull request #3794 from matrix-org/dbkr/slashverify_checkdevicetrust ... Convert /verify to checkDeviceTrust	2020-01-03 13:08:24 +00:00
David Baker	c2723176e4	Convert /verify to checkDeviceTrust ... Also de-promiseify the code a bit	2020-01-03 12:08:35 +00:00
David Baker	557669b08e	Don't crash if a keyshare request is removed ... ...during the time the dialog is displayed. Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)	2020-01-03 11:12:55 +00:00
David Baker	560cff0ae1	Merge pull request #3791 from matrix-org/dbkr/remove_e2etile_onclick ... Remove E2eIcon onClick	2020-01-02 17:16:25 +00:00
David Baker	89ac476281	Unused import	2020-01-02 16:59:46 +00:00
David Baker	39777620a3	order copyright lines by date	2020-01-02 16:58:00 +00:00
David Baker	ffba19bd61	Remove E2eIcon onClick ... It displayed the Encrypted Event Info dialog, but this full of super advanced debug information and base64 strings that no normal users should ever have to see. It's still accessible via the comtext menu (ie. the same place as 'View Source').	2020-01-02 16:52:25 +00:00
Travis Ralston	c88efa5c2c	Merge pull request #3778 from bit/master ... support channel names with slash in name/alias	2020-01-02 09:19:02 -07: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
Travis Ralston	6ef6b5909f	Merge pull request #3787 from matrix-org/travis/membership-tile ... Fix NPE when filtering the room list	2019-12-27 11:37:38 -07: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
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
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
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
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
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
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
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	06230e01e3	Fix End-to-End tests for RoomSettings interactivity	2019-12-26 19:36:16 +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
Michael Telatynski	115e773317	Merge pull request #3780 from ps0305/ps0305-patch-1 ... Fix spelling and grammar in README	2019-12-26 18:05:47 +00:00
Michael Telatynski	73800c9a92	Fix UserInfo promote user inverted buttons	2019-12-26 18:04:58 +00:00
Pankaj Kumar Singh	a9cae90a52	Signed-off-by Pankaj Singh <singh.pankaj@live.com	2019-12-26 23:11:17 +05:30
Travis Ralston	e7eac2ec85	Merge pull request #3776 from matrix-org/travis/fix-resizer ... Reintroduce working resizer code for right panel	2019-12-25 15:16:03 -07: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
Michael Telatynski	8c70eda517	Merge pull request #3775 from matrix-org/t3chguy/fix_TopLeftMenu_help ... Fix wrong scope binding on openHelp for TopLeftMenu	2019-12-23 19:40:02 +00:00
Michael Telatynski	25d864c39d	Fix wrong scope binding on openHelp for TopLeftMenu	2019-12-23 19:29:43 +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
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
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
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
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	84eb72b0e0	fix alignment	2019-12-23 11:38:52 +00:00