37e3c2a23a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5501  from matrix-org/t3chguy/fix/15936  
							
							... 
							
							
							
							Fix padding in confirmation email registration prompt 
							
						 
						
							2020-12-17 12:05:37 +00:00  
				
					
						
							
							
								 
						
							
							
								c498609f79 
								
							
								 
							
						 
						
							
							
								
								Fix padding in confirmation email registration prompt  
							
							
							
						 
						
							2020-12-17 10:47:03 +00:00  
				
					
						
							
							
								 
						
							
							
								f2214c0367 
								
							
								 
							
						 
						
							
							
								
								Fix room list help prompt alignment  
							
							
							
						 
						
							2020-12-17 10:43:53 +00:00  
				
					
						
							
							
								 
						
							
							
								018743a639 
								
									
								
							
								 
							
						 
						
							
							
								
								Update _MemberList.scss  
							
							
							
						 
						
							2020-12-15 11:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								89240b84fb 
								
							
								 
							
						 
						
							
							
								
								Only want margins on the large view  
							
							
							
						 
						
							2020-12-10 15:52:03 +00:00  
				
					
						
							
							
								 
						
							
							
								5282c6bbe8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2  
							
							
							
						 
						
							2020-12-10 12:36:11 +00:00  
				
					
						
							
							
								 
						
							
							
								f987908d04 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5446  from matrix-org/dbkr/hold_ui  
							
							... 
							
							
							
							Add UI for hold functionality 
							
						 
						
							2020-12-10 12:30:59 +00:00  
				
					
						
							
							
								 
						
							
							
								083fecbddb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5411  from aaronraimist/searchbox-fix-width  
							
							... 
							
							
							
							Allow SearchBox to expand to fill width 
							
						 
						
							2020-12-09 20:14:02 +00:00  
				
					
						
							
							
								 
						
							
							
								918326631f 
								
									
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2020-12-08 14:35:05 -06:00  
				
					
						
							
							
								 
						
							
							
								8f24656603 
								
							
								 
							
						 
						
							
							
								
								Make margins & header font match widgets  
							
							
							
						 
						
							2020-12-08 19:26:57 +00:00  
				
					
						
							
							
								 
						
							
							
								70964e43f6 
								
							
								 
							
						 
						
							
							
								
								Fix font weights in hold text  
							
							
							
						 
						
							2020-12-08 19:05:58 +00:00  
				
					
						
							
							
								 
						
							
							
								d77c5b46eb 
								
							
								 
							
						 
						
							
							
								
								Fix width of underline in server picker dialog  
							
							
							
						 
						
							2020-12-08 11:56:42 +00:00  
				
					
						
							
							
								 
						
							
							
								b9d70cb1a3 
								
							
								 
							
						 
						
							
							
								
								Fix indentation  
							
							
							
						 
						
							2020-12-07 18:40:29 +00:00  
				
					
						
							
							
								 
						
							
							
								365d6982ce 
								
							
								 
							
						 
						
							
							
								
								Add secondary call avatar to main voice content view  
							
							
							
						 
						
							2020-12-07 18:28:43 +00:00  
				
					
						
							
							
								 
						
							
							
								8a58c9dea0 
								
							
								 
							
						 
						
							
							
								
								Update UI for two calls in the PiP view  
							
							... 
							
							
							
							and also merge hold_ui changes 
							
						 
						
							2020-12-07 17:56:36 +00:00  
				
					
						
							
							
								 
						
							
							
								747d743bd0 
								
							
								 
							
						 
						
							
							
								
								Add 60% opacity black over the avatars when on hold  
							
							
							
						 
						
							2020-12-07 16:22:57 +00:00  
				
					
						
							
							
								 
						
							
							
								3b25a3be98 
								
							
								 
							
						 
						
							
							
								
								Smaller avatar, more padding on text  
							
							
							
						 
						
							2020-12-07 15:42:35 +00:00  
				
					
						
							
							
								 
						
							
							
								c7f1d97b1a 
								
							
								 
							
						 
						
							
							
								
								Round off the sharp corners  
							
							... 
							
							
							
							Before you have someone's eye out 
							
						 
						
							2020-12-07 15:38:55 +00:00  
				
					
						
							
							
								 
						
							
							
								32f7e3552c 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove globally defined flex and set just for group queries  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2020-12-05 21:56:17 -06:00  
				
					
						
							
							
								 
						
							
							
								3ec9d93cb0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into searchbox-fix-width  
							
							
							
						 
						
							2020-12-05 19:53:08 -06:00  
				
					
						
							
							
								 
						
							
							
								ab71547c4c 
								
							
								 
							
						 
						
							
							
								
								Don't let call room names push out their containers  
							
							
							
						 
						
							2020-12-04 20:36:08 +00:00  
				
					
						
							
							
								 
						
							
							
								6916b5d7c6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui  
							
							
							
						 
						
							2020-12-03 17:57:22 +00:00  
				
					
						
							
							
								 
						
							
							
								0b15ab06d8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2  
							
							
							
						 
						
							2020-12-03 17:56:39 +00:00  
				
					
						
							
							
								 
						
							
							
								1ce63f0fa7 
								
							
								 
							
						 
						
							
							
								
								Line 1 / 2 Support  
							
							... 
							
							
							
							Support one active call plus one call on hold 
							
						 
						
							2020-12-03 17:45:49 +00:00  
				
					
						
							
							
								 
						
							
							
								3fda7e3f46 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials  
							
							
							
						 
						
							2020-12-02 15:08:13 +00:00  
				
					
						
							
							
								 
						
							
							
								4a503fb32e 
								
							
								 
							
						 
						
							
							
								
								Fix VoIP call plinth on dark theme  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15873  
							
						 
						
							2020-12-02 12:14:41 +00:00  
				
					
						
							
							
								 
						
							
							
								eb25c39318 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials  
							
							... 
							
							
							
							 Conflicts:
	src/i18n/strings/en_EN.json 
							
						 
						
							2020-12-01 16:33:29 +00:00  
				
					
						
							
							
								 
						
							
							
								31044b68d1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui  
							
							
							
						 
						
							2020-12-01 15:09:25 +00:00  
				
					
						
							
							
								 
						
							
							
								4ca35fabef 
								
							
								 
							
						 
						
							
							
								
								Visual tweaks  
							
							
							
						 
						
							2020-12-01 13:44:24 +00:00  
				
					
						
							
							
								 
						
							
							
								ced68a6fbc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5447  from matrix-org/travis/fix-stickerpicker  
							
							... 
							
							
							
							Fix the stickerpicker 
							
						 
						
							2020-11-27 07:06:35 -07:00  
				
					
						
							
							
								 
						
							
							
								edd5bf5842 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5421  from matrix-org/t3chguy/fix/15700  
							
							... 
							
							
							
							Simplify UserMenu for Guests as they can't use most of the options 
							
						 
						
							2020-11-27 10:57:54 +00:00  
				
					
						
							
							
								 
						
							
							
								f2bc3db8fd 
								
							
								 
							
						 
						
							
							
								
								Fix visual gap of sticker picker at bottom  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15690  
							
						 
						
							2020-11-26 15:09:44 -07:00  
				
					
						
							
							
								 
						
							
							
								2a02e57a95 
								
							
								 
							
						 
						
							
							
								
								Add UI for hold functionality  
							
							
							
						 
						
							2020-11-26 14:35:09 +00:00  
				
					
						
							
							
								 
						
							
							
								1b1c482f9c 
								
							
								 
							
						 
						
							
							
								
								Iterate tests  
							
							
							
						 
						
							2020-11-25 10:22:16 +00:00  
				
					
						
							
							
								 
						
							
							
								758b47c64d 
								
							
								 
							
						 
						
							
							
								
								Replace *ServerConfig and SignInToText with ServerPicker  
							
							
							
						 
						
							2020-11-25 09:46:56 +00:00  
				
					
						
							
							
								 
						
							
							
								2f64160a0e 
								
							
								 
							
						 
						
							
							
								
								Remove backwards compatibility in ServerConfig for m.require_identity_server  
							
							
							
						 
						
							2020-11-25 09:00:31 +00:00  
				
					
						
							
							
								 
						
							
							
								f7d7182dc9 
								
							
								 
							
						 
						
							
							
								
								Iterate Multi-SSO support  
							
							
							
						 
						
							2020-11-24 12:09:11 +00:00  
				
					
						
							
							
								 
						
							
							
								b1ca1eb3f5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials  
							
							
							
						 
						
							2020-11-24 11:30:51 +00:00  
				
					
						
							
							
								 
						
							
							
								1d53a5cf23 
								
							
								 
							
						 
						
							
							
								
								Initial support for MSC2858  
							
							
							
						 
						
							2020-11-24 11:18:11 +00:00  
				
					
						
							
							
								 
						
							
							
								613710b75c 
								
							
								 
							
						 
						
							
							
								
								Iterate Auth copy  
							
							
							
						 
						
							2020-11-23 17:01:35 +00:00  
				
					
						
							
							
								 
						
							
							
								f0fdfd53d2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5432  from matrix-org/dbkr/new_look_callview  
							
							... 
							
							
							
							New Look in-Call View 
							
						 
						
							2020-11-23 15:51:09 +00:00  
				
					
						
							
							
								 
						
							
							
								729d59160d 
								
							
								 
							
						 
						
							
							
								
								Rename buttons in CSS & remove unused  
							
							
							
						 
						
							2020-11-23 15:27:37 +00:00  
				
					
						
							
							
								 
						
							
							
								576ba21210 
								
							
								 
							
						 
						
							
							
								
								Comment nonzero opacity  
							
							
							
						 
						
							2020-11-23 15:13:19 +00:00  
				
					
						
							
							
								 
						
							
							
								2263280035 
								
							
								 
							
						 
						
							
							
								
								Improve no email warning during registration  
							
							
							
						 
						
							2020-11-23 10:25:46 +00:00  
				
					
						
							
							
								 
						
							
							
								5f47077a30 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5385  from matrix-org/travis/msc-send-widget-events  
							
							... 
							
							
							
							Add new widget API actions for changing rooms and sending/receiving events 
							
						 
						
							2020-11-20 09:17:18 -07:00  
				
					
						
							
							
								 
						
							
							
								c80b0aff7d 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2020-11-19 12:09:57 -07:00  
				
					
						
							
							
								 
						
							
							
								0104164d51 
								
							
								 
							
						 
						
							
							
								
								Approximate the design as proposed  
							
							
							
						 
						
							2020-11-19 12:06:24 -07:00  
				
					
						
							
							
								 
						
							
							
								49bd66c377 
								
							
								 
							
						 
						
							
							
								
								Change fullscreen button to expand button in PIP view  
							
							... 
							
							
							
							and fix call controls which didn't appear in video call 
							
						 
						
							2020-11-19 16:36:23 +00:00  
				
					
						
							
							
								 
						
							
							
								50965e41eb 
								
							
								 
							
						 
						
							
							
								
								Remove call bar  
							
							... 
							
							
							
							Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview. 
							
						 
						
							2020-11-19 15:15:31 +00:00  
				
					
						
							
							
								 
						
							
							
								44649ca372 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5333  from resynth1943/add-border-radius-for-video  
							
							... 
							
							
							
							Add border-radius for video 
							
						 
						
							2020-11-19 11:00:07 +00:00