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  
				
					
						
							
							
								 
						
							
							
								25d864c39d 
								
							
								 
							
						 
						
							
							
								
								Fix wrong scope binding on openHelp for TopLeftMenu  
							
							
							
						 
						
							2019-12-23 19:29:43 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0497ef228d 
								
							
								 
							
						 
						
							
							
								
								UserInfo hide kick/mute buttons if they make no sense  
							
							
							
						 
						
							2019-12-23 18:20:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e552195701 
								
							
								 
							
						 
						
							
							
								
								Fix duplicate Incoming Call prompt on Community Invite sublist  
							
							
							
						 
						
							2019-12-23 17:57:53 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1da55c530b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3772  from matrix-org/t3chguy/alts  
							
							... 
							
							
							
							Add alt="" to presentational images 
							
						 
						
							2019-12-23 17:15:58 +00:00  
				
					
						
							
							
								 
						
							
							
								8018097e56 
								
							
								 
							
						 
						
							
							
								
								Add alt="" to presentational images  
							
							
							
						 
						
							2019-12-23 14:13:56 +00:00  
				
					
						
							
							
								 
						
							
							
								207045e979 
								
							
								 
							
						 
						
							
							
								
								fix ReadReceiptMarker ref  
							
							
							
						 
						
							2019-12-23 12:54:31 +00:00  
				
					
						
							
							
								 
						
							
							
								17f5849985 
								
							
								 
							
						 
						
							
							
								
								stop using ReactDOM.findDOMNode in componentWillUnmount, use refs  
							
							
							
						 
						
							2019-12-23 12:24:49 +00:00  
				
					
						
							
							
								 
						
							
							
								84eb72b0e0 
								
							
								 
							
						 
						
							
							
								
								fix alignment  
							
							
							
						 
						
							2019-12-23 11:38:52 +00:00  
				
					
						
							
							
								 
						
							
							
								afcbb218fa 
								
							
								 
							
						 
						
							
							
								
								match padding on CustomRoomTagPanel and fix colour of Communities btn  
							
							
							
						 
						
							2019-12-23 11:31:30 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								24a1017d6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix typo in comment  
							
							
							
						 
						
							2019-12-21 20:26:32 +00:00  
				
					
						
							
							
								 
						
							
							
								25f59ed43d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3758  from matrix-org/dbkr/hide_verify_if_verified  
							
							... 
							
							
							
							Don't show the 'verify' button if the user is verified 
							
						 
						
							2019-12-21 17:41:01 +00:00  
				
					
						
							
							
								 
						
							
							
								8fbd35f1e9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3757  from matrix-org/dbkr/switch_to_checkdevicetrust  
							
							... 
							
							
							
							Switch to using checkDeviceTrust 
							
						 
						
							2019-12-21 17:40:50 +00:00  
				
					
						
							
							
								 
						
							
							
								e936f7eb09 
								
							
								 
							
						 
						
							
							
								
								Fix room list filtering weird case sensitivity  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-12-21 11:13:37 +00:00  
				
					
						
							
							
								 
						
							
							
								376bf7e213 
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							
							
						 
						
							2019-12-20 16:56:38 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3a36d61fab 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2019-12-19 21:10:22 +00:00  
				
					
						
							
							
								 
						
							
							
								d9ea9b4ad3 
								
							
								 
							
						 
						
							
							
								
								Iterate to match design on Zeplin  
							
							
							
						 
						
							2019-12-19 20:53:34 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a21fdb17fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3749  from matrix-org/dbkr/keybackup_migrate  
							
							... 
							
							
							
							Migrate key backups to SSSS 
							
						 
						
							2019-12-19 20:18:28 +00:00  
				
					
						
							
							
								 
						
							
							
								b2249d0561 
								
							
								 
							
						 
						
							
							
								
								Initial rejig  
							
							
							
						 
						
							2019-12-19 20:09:05 +00:00  
				
					
						
							
							
								 
						
							
							
								b98058fc3c 
								
							
								 
							
						 
						
							
							
								
								Add bug for removing temporary srceen  
							
							
							
						 
						
							2019-12-19 19:54:44 +00:00  
				
					
						
							
							
								 
						
							
							
								822762f014 
								
							
								 
							
						 
						
							
							
								
								add todo  
							
							
							
						 
						
							2019-12-19 19:49:36 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								48b166f451 
								
							
								 
							
						 
						
							
							
								
								Pass the key backup into the right thing  
							
							
							
						 
						
							2019-12-19 17:28:32 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a25bc94343 
								
							
								 
							
						 
						
							
							
								
								remove unused, commented line of code  
							
							
							
						 
						
							2019-12-19 17:22:02 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1c31fd3413 
								
							
								 
							
						 
						
							
							
								
								Apply new design to highlighted tags and add toggle mechanic  
							
							
							
						 
						
							2019-12-19 16:54:30 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e54429680b 
								
							
								 
							
						 
						
							
							
								
								tidy up  
							
							
							
						 
						
							2019-12-19 15:28:11 +00:00  
				
					
						
							
							
								 
						
							
							
								c5e7594fe9 
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							
							
						 
						
							2019-12-19 15:27:29 +00:00  
				
					
						
							
							
								 
						
							
							
								26980e2ad5 
								
							
								 
							
						 
						
							
							
								
								apply unhomoglyph when filtering room list to fuzzify it  
							
							
							
						 
						
							2019-12-19 15:26:04 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								29523000dc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3748  from matrix-org/t3chguy/avatar_userinfo  
							
							... 
							
							
							
							Replace UserInfo avatar with <MemberAvatar/> for fallback logic 
							
						 
						
							2019-12-19 14:39:11 +00:00  
				
					
						
							
							
								 
						
							
							
								3678e64f5d 
								
							
								 
							
						 
						
							
							
								
								Internationalise M_TOO_LARGE error from Synapse  
							
							
							
						 
						
							2019-12-19 13:25:43 +00:00  
				
					
						
							
							
								 
						
							
							
								66783dff9e 
								
							
								 
							
						 
						
							
							
								
								Fix scaling of the avatar in UserInfo  
							
							
							
						 
						
							2019-12-19 12:27:25 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3196655524 
								
							
								 
							
						 
						
							
							
								
								Replace UserInfo avatar with <MemberAvatar/> for fallback logic  
							
							
							
						 
						
							2019-12-19 10:42:47 +00:00  
				
					
						
							
							
								 
						
							
							
								a1df87a375 
								
							
								 
							
						 
						
							
							
								
								Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed  
							
							
							
						 
						
							2019-12-19 07:23:05 +00:00  
				
					
						
							
							
								 
						
							
							
								d35b01b63a 
								
							
								 
							
						 
						
							
							
								
								Get rid of stripped-emoji.json in favour of an in-memory single truth source  
							
							
							
						 
						
							2019-12-18 15:40:19 +00:00  
				
					
						
							
							
								 
						
							
							
								513ec30ef1 
								
							
								 
							
						 
						
							
							
								
								Fix tests v2  
							
							
							
						 
						
							2019-12-17 18:02:45 +00:00