Jaiwanth
							
						 
						
							 
							
							
							
								
							
								190ccb6f00 
								
							
								 
							
						 
						
							
							
								
								Merge and add export support for the modified MAudioBody  
							
							 
							
							
							
						 
						
							2021-07-02 10:41:04 +05:30  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d9eec1c03b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/message-bubbles-4635  
							
							 
							
							
							
						 
						
							2021-06-30 08:58:20 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								e505646f21 
								
							
								 
							
						 
						
							
							
								
								Finish dialog implementation of export settings  
							
							 
							
							
							
						 
						
							2021-06-26 21:54:10 +05:30  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9c752680ba 
								
							
								 
							
						 
						
							
							
								
								Tile styling and early behaviour  
							
							 
							
							
							
						 
						
							2021-06-24 13:56:11 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ffef2e58cb 
								
							
								 
							
						 
						
							
							
								
								Unify audio message types to new media body  
							
							 
							
							
							
						 
						
							2021-06-24 11:38:35 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								470778cbb8 
								
							
								 
							
						 
						
							
							
								
								Move voice message components to audio-generic directory  
							
							 
							
							
							
						 
						
							2021-06-24 11:38:35 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9f2eba4351 
								
							
								 
							
						 
						
							
							
								
								Fix class identifiers  
							
							 
							
							
							
						 
						
							2021-06-24 11:38:35 -06:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								adb42b7927 
								
							
								 
							
						 
						
							
							
								
								Deprecate FormButton to use AccessibleButton everywhere  
							
							 
							
							
							
						 
						
							2021-06-21 14:16:37 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								6271c5c3d8 
								
							
								 
							
						 
						
							
							
								
								first iteration for message bubble layout  
							
							 
							
							
							
						 
						
							2021-06-18 18:59:22 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								d89392a1d9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip  
							
							 
							
							
							
						 
						
							2021-06-17 15:41:19 +02:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								cdd2773aa6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-06-15 17:37:49 +03:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								e5188a5258 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share  
							
							 
							
							
							
						 
						
							2021-06-12 13:32:49 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								5608e92885 
								
									
								
							
								 
							
						 
						
							
							
								
								Add styling for CallViewSidebar  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-12 08:09:51 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								fdda534053 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-09 19:23:14 +02:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								059241b5cc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-06-07 19:26:12 +03:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								6eb33ac730 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-04 07:49:05 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								3ac63b03a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Use styling for CallEvent  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-05-30 19:44:17 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								59f4c728c9 
								
							
								 
							
						 
						
							
							
								
								Initial cut of Pinned event card in the right panel  
							
							 
							
							
							
						 
						
							2021-05-25 16:10:44 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								64e828d069 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-16 08:13:59 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								565e41c3df 
								
							
								 
							
						 
						
							
							
								
								Extract UntrustedDeviceDialog and fix e2ee icon  
							
							 
							
							
							
						 
						
							2021-05-12 17:04:24 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7396ce76e5 
								
							
								 
							
						 
						
							
							
								
								Tweak the feedbacks a tad  
							
							 
							
							
							
						 
						
							2021-05-11 17:30:33 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								b9b237fc9a 
								
							
								 
							
						 
						
							
							
								
								Replace forwarding UI with dialog  
							
							 
							
							... 
							
							
							
							Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-08 21:11:06 -04:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								cc919452b5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-05-07 00:07:51 +03:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								90538c95aa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021  
							
							 
							
							
							
						 
						
							2021-05-06 08:05:14 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								3f4ee9742a 
								
							
								 
							
						 
						
							
							
								
								Simple rendering of voice messages in the timeline  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/17138  
							
						 
						
							2021-05-03 11:41:14 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								7faf9eb4cc 
								
									
								
							
								 
							
						 
						
							
							
								
								Use styling for CallPreview  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-05-03 15:39:37 +02:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								09f9916916 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-05-01 15:37:32 +03:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a4f02937cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021  
							
							 
							
							... 
							
							
							
							 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx 
							
						 
						
							2021-04-29 09:52:21 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								c2d37af1cb 
								
							
								 
							
						 
						
							
							
								
								Move playback to its own set of classes  
							
							 
							
							... 
							
							
							
							This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline.
Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need.
The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag.
Waveform calculations have also been moved into the base component, deduplicating the math a bit. 
							
						 
						
							2021-04-27 22:23:57 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								30e120284d 
								
							
								 
							
						 
						
							
							
								
								Add simple play/pause controls  
							
							 
							
							
							
						 
						
							2021-04-27 15:02:15 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c5f653245a 
								
							
								 
							
						 
						
							
							
								
								Show Spaces beta card in Labs & My Communities view  
							
							 
							
							... 
							
							
							
							the image is temporary 
							
						 
						
							2021-04-27 16:29:42 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								b8ef67e447 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-04-19 13:37:27 +03:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								798a891d83 
								
							
								 
							
						 
						
							
							
								
								Tweak appearance of invite reason  
							
							 
							
							... 
							
							
							
							This adjusts the display of invite reasons to match design feedback.
Fixes https://github.com/vector-im/element-web/issues/16869  
							
						 
						
							2021-04-12 12:28:42 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								202ead40c4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into resizable-call-view  
							
							 
							
							
							
						 
						
							2021-04-04 11:35:26 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								54412878a1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/voice-messages/waveform  
							
							 
							
							
							
						 
						
							2021-03-29 22:59:51 -06:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								c31967dc97 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-03-26 21:31:28 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								5061db259a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12  
							
							 
							
							
							
						 
						
							2021-03-25 16:37:56 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ea77ab125e 
								
							
								 
							
						 
						
							
							
								
								Show a face pile on a space preview  
							
							 
							
							
							
						 
						
							2021-03-25 16:15:34 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								449e028bbd 
								
							
								 
							
						 
						
							
							
								
								Actually use a waveform instead of the frequency data  
							
							 
							
							
							
						 
						
							2021-03-24 23:31:02 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8ddd14e252 
								
							
								 
							
						 
						
							
							
								
								Early concept for rendering the frequency waveform  
							
							 
							
							
							
						 
						
							2021-03-24 22:17:45 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9aa5348c7f 
								
							
								 
							
						 
						
							
							
								
								Show a stop button to stop the recording  
							
							 
							
							
							
						 
						
							2021-03-16 23:43:59 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								787a62846e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into resizable-call-view  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-03-16 07:55:56 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								8c8b46b984 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-03-12 14:18:12 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								77cf4cf7a4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5706  from matrix-org/t3chguy/spaces4.4  
							
							 
							
							... 
							
							
							
							Space room hierarchies 
							
						 
						
							2021-03-03 15:25:00 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								a8ff0fa75f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5705  from matrix-org/t3chguy/spaces4.3  
							
							 
							
							... 
							
							
							
							Iterate Space view and right panel 
							
						 
						
							2021-03-03 13:37:40 +00:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3f7e5f031 
								
									
								
							
								 
							
						 
						
							
							
								
								Add CallViewForRoom  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-03-02 20:32:25 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								49fc053b94 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5704  from matrix-org/t3chguy/spaces4.2  
							
							 
							
							... 
							
							
							
							Initial Space Room View and Creation UX 
							
						 
						
							2021-03-02 17:17:39 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								a5ee029c62 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5452  from SimonBrandner/feature-multi-language-spell-check  
							
							 
							
							... 
							
							
							
							Add multi language spell check 
							
						 
						
							2021-03-02 14:38:21 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								faf7a4b8bc 
								
							
								 
							
						 
						
							
							
								
								Initial Space room directory view  
							
							 
							
							
							
						 
						
							2021-03-02 14:14:50 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e479edd47a 
								
							
								 
							
						 
						
							
							
								
								Add an add existing room to space CTA to Space View  
							
							 
							
							
							
						 
						
							2021-03-02 13:34:53 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ab4b7b73ea 
								
							
								 
							
						 
						
							
							
								
								Add a basic Space Settings view  
							
							 
							
							
							
						 
						
							2021-03-02 13:26:00 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c10512fd56 
								
							
								 
							
						 
						
							
							
								
								Initial SpaceRoomView work  
							
							 
							
							
							
						 
						
							2021-03-01 18:53:11 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								483d56320c 
								
							
								 
							
						 
						
							
							
								
								Beginning of space creation UX from space panel  
							
							 
							
							
							
						 
						
							2021-03-01 17:47:40 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f21aedc6cf 
								
							
								 
							
						 
						
							
							
								
								Add Space Panel with Room List filtering  
							
							 
							
							
							
						 
						
							2021-02-26 10:41:26 +00:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								dfcf701449 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2021-02-19 21:47:10 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								bd0e5446c5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature-multi-language-spell-check  
							
							 
							
							
							
						 
						
							2021-02-18 18:16:16 +01:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								5fe3c83f27 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip  
							
							 
							
							
							
						 
						
							2021-02-09 11:18:51 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								158036ccf9 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip  
							
							 
							
							
							
						 
						
							2021-01-15 16:12:53 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b2850e11db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing  
							
							 
							
							
							
						 
						
							2021-01-13 19:47:07 +01:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								2b98f14242 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into jaywink/hosting-provider-iframe  
							
							 
							
							
							
						 
						
							2021-01-11 11:16:03 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								640e6d68b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into fix-screen-sharing  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-01-05 20:41:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4b43929aa3 
								
							
								 
							
						 
						
							
							
								
								Add in-call dialpad for DTMF sending  
							
							 
							
							... 
							
							
							
							Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573  
							
						 
						
							2021-01-04 20:01:43 +00:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								bb53ae8038 
								
							
								 
							
						 
						
							
							
								
								Rename Element Pro -> Host Signup  
							
							 
							
							
							
						 
						
							2021-01-04 16:05:49 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								7a358b1ca3 
								
							
								 
							
						 
						
							
							
								
								Rename components to be less EMS specific  
							
							 
							
							
							
						 
						
							2020-12-28 11:21:42 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								675ca58eef 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve UI  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2020-12-26 16:56:25 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								452fbb076b 
								
							
								 
							
						 
						
							
							
								
								Add a dialpad UI for PSTN lookup  
							
							 
							
							... 
							
							
							
							Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user. 
							
						 
						
							2020-12-23 19:02:01 +00:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								5aa24b97cd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jaywink/elementPro  
							
							 
							
							
							
						 
						
							2020-12-16 14:45:16 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								26d0e7797c 
								
							
								 
							
						 
						
							
							
								
								Fix ordering  
							
							 
							
							
							
						 
						
							2020-12-15 10:55:24 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								db370f218e 
								
							
								 
							
						 
						
							
							
								
								Rename also _HostingSignupDialog.scss  
							
							 
							
							
							
						 
						
							2020-12-15 10:53:59 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6916b5d7c6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui  
							
							 
							
							
							
						 
						
							2020-12-03 17:57:22 +00:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
							
								
							
								19d9ea3477 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature-multi-language-spell-check  
							
							 
							
							
							
						 
						
							2020-12-03 12:06:43 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
							
								
							
								8f40cd39fd 
								
							
								 
							
						 
						
							
							
								
								Added styling  
							
							 
							
							
							
						 
						
							2020-11-29 12:29:05 +01:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								b3b3f5ebeb 
								
							
								 
							
						 
						
							
							
								
								Fix HostingSignupDialog layouting inside dialog  
							
							 
							
							
							
						 
						
							2020-11-27 15:10:35 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								c7706ac3d5 
								
							
								 
							
						 
						
							
							
								
								Add possibility for hosting provider IFrame  
							
							 
							
							... 
							
							
							
							Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.
Add iframe for hosting provider signup content 
							
						 
						
							2020-11-27 15:10:35 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2a02e57a95 
								
							
								 
							
						 
						
							
							
								
								Add UI for hold functionality  
							
							 
							
							
							
						 
						
							2020-11-26 14:35:09 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								758b47c64d 
								
							
								 
							
						 
						
							
							
								
								Replace *ServerConfig and SignInToText with ServerPicker  
							
							 
							
							
							
						 
						
							2020-11-25 09:46:56 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b1ca1eb3f5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials  
							
							 
							
							
							
						 
						
							2020-11-24 11:30:51 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								1d53a5cf23 
								
							
								 
							
						 
						
							
							
								
								Initial support for MSC2858  
							
							 
							
							
							
						 
						
							2020-11-24 11:18:11 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2263280035 
								
							
								 
							
						 
						
							
							
								
								Improve no email warning during registration  
							
							 
							
							
							
						 
						
							2020-11-23 10:25:46 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								55592d365c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/msc-send-widget-events  
							
							 
							
							
							
						 
						
							2020-11-18 15:57:53 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								a212dab84c 
								
							
								 
							
						 
						
							
							
								
								Developer design a permissions dialog  
							
							 
							
							
							
						 
						
							2020-11-17 20:38:59 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								e05fcc8d34 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5408  from matrix-org/t3chguy/fix/15400  
							
							 
							
							... 
							
							
							
							Update styling of the Analytics toast 
							
						 
						
							2020-11-17 15:35:20 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								bf62960e1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5413  from matrix-org/t3chguy/fix/11415  
							
							 
							
							... 
							
							
							
							Change how we expose Role in User Info and hide in DMs 
							
						 
						
							2020-11-11 18:15:46 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								0766519467 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5398  from matrix-org/t3chguy/fix/8141  
							
							 
							
							... 
							
							
							
							Improvements around new room empty space interactions 
							
						 
						
							2020-11-10 13:09:59 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								5fb86f74d7 
								
							
								 
							
						 
						
							
							
								
								Remove unused IconButton  
							
							 
							
							
							
						 
						
							2020-11-10 12:06:56 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								36ef9ec341 
								
							
								 
							
						 
						
							
							
								
								Update styling of the Analytics toast to try and decrease number of users blindly pressing No  
							
							 
							
							
							
						 
						
							2020-11-09 14:21:45 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								664079a127 
								
							
								 
							
						 
						
							
							
								
								Use MiniAvatarUploader for the new NewRoomIntro component  
							
							 
							
							
							
						 
						
							2020-11-05 15:50:42 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6aeea3e38e 
								
							
								 
							
						 
						
							
							
								
								Extract MiniAvatarUploader into a reusable component  
							
							 
							
							
							
						 
						
							2020-11-05 15:42:45 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ff25a9b45d 
								
							
								 
							
						 
						
							
							
								
								Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth  
							
							 
							
							
							
						 
						
							2020-11-04 17:06:38 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7796621e8d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/call_hold  
							
							 
							
							
							
						 
						
							2020-10-30 16:49:42 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f828c6d494 
								
							
								 
							
						 
						
							
							
								
								Implement call hold  
							
							 
							
							... 
							
							
							
							Currently just by adding /holdcall and /unholdcall slash commands
The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.
Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened. 
							
						 
						
							2020-10-29 17:56:24 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c3a355097d 
								
							
								 
							
						 
						
							
							
								
								Initial Countly work  
							
							 
							
							
							
						 
						
							2020-10-29 15:57:16 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0004dd4475 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets  
							
							 
							
							
							
						 
						
							2020-10-22 21:40:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4e12aeca9e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/AppTile.js 
							
						 
						
							2020-10-21 12:48:51 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bec1d718e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts 
							
						 
						
							2020-10-19 20:50:16 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								00b1a03a3e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts 
							
						 
						
							2020-10-19 19:46:07 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								744a4abd1c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets  
							
							 
							
							
							
						 
						
							2020-10-19 13:08:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7820f9c28a 
								
							
								 
							
						 
						
							
							
								
								Switch to WidgetAvatar  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-12 13:16:55 +01:00  
						
					 
				
					
						
							
							
								 
								RinkiyaKeDad
							
						 
						
							 
							
							
							
								
							
								4f8b0afc41 
								
							
								 
							
						 
						
							
							
								
								updated TagPanel  
							
							 
							
							
							
						 
						
							2020-10-10 18:00:06 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ada6d1aa46 
								
							
								 
							
						 
						
							
							
								
								Iterate PR  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-09 08:42:21 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								40292884bf 
								
							
								 
							
						 
						
							
							
								
								Regenerate component CSS index  
							
							 
							
							
							
						 
						
							2020-10-07 13:09:03 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								2bb7b6535f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-10-02 17:28:45 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								42955856d5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious  
							
							 
							
							
							
						 
						
							2020-09-28 13:41:48 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fbbba75f81 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets  
							
							 
							
							
							
						 
						
							2020-09-25 14:31:44 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								44bc8fc67e 
								
							
								 
							
						 
						
							
							
								
								Initial Modal Widget work tweaks MSC2790  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-09-25 14:08:27 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								956a3bf69d 
								
							
								 
							
						 
						
							
							
								
								Implement Left Panel User Widget  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-09-24 09:28:49 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								987cdf1bf0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-09-19 19:14:37 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								870c35be6f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/ft-sep1620/09-enc-files  
							
							 
							
							
							
						 
						
							2020-09-18 10:56:20 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								bfbbf44dfc 
								
							
								 
							
						 
						
							
							
								
								Add a note to use the desktop builds when seshat isn't available  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15184 
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896  but does not fix it. 
							
						 
						
							2020-09-16 17:23:37 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								b4af0140d4 
								
							
								 
							
						 
						
							
							
								
								Render Jitsi widget state events in a more obvious way  
							
							 
							
							... 
							
							
							
							A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred. 
							
						 
						
							2020-09-16 12:38:47 -06:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								26b465f1fd 
								
							
								 
							
						 
						
							
							
								
								Remove room recovery reminder  
							
							 
							
							... 
							
							
							
							The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895  
							
						 
						
							2020-09-16 15:03:06 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								7bd5e3fa31 
								
							
								 
							
						 
						
							
							
								
								Move security-related dialogs to a common directory  
							
							 
							
							
							
						 
						
							2020-09-16 15:03:06 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								e7e6bc93ec 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5182  from matrix-org/jryans/defer-cross-signing-setup  
							
							 
							
							... 
							
							
							
							Split up cross-signing and secure backup settings 
							
						 
						
							2020-09-11 09:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								31cca5e0f2 
								
							
								 
							
						 
						
							
							
								
								Create new right panel cards  
							
							 
							
							
							
						 
						
							2020-09-08 15:42:31 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								46bc6b1d14 
								
							
								 
							
						 
						
							
							
								
								Rename key backup to secure backup  
							
							 
							
							
							
						 
						
							2020-09-04 13:56:28 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								75a0178dad 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-09-04 12:41:38 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								fdbaddbace 
								
							
								 
							
						 
						
							
							
								
								Add a simple edit dialog for communities  
							
							 
							
							
							
						 
						
							2020-08-31 10:52:08 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								82b015bd5f 
								
							
								 
							
						 
						
							
							
								
								Rename components to match prior convention  
							
							 
							
							
							
						 
						
							2020-08-26 08:52:39 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								56c7f86983 
								
							
								 
							
						 
						
							
							
								
								Add an invite users to community step to dialog flow  
							
							 
							
							
							
						 
						
							2020-08-25 21:08:31 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								7c1a9993e3 
								
							
								 
							
						 
						
							
							
								
								Add new create group dialog  
							
							 
							
							
							
						 
						
							2020-08-25 21:08:24 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								c815a370e7 
								
							
								 
							
						 
						
							
							
								
								Remove some unused components  
							
							 
							
							... 
							
							
							
							We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.
The room tile context menu and top left menu are artifacts of the old room list.
The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it. 
							
						 
						
							2020-08-20 20:47:02 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8cff59f123 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into travis/download-logs  
							
							 
							
							
							
						 
						
							2020-08-18 17:36:04 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								24a088e234 
								
							
								 
							
						 
						
							
							
								
								Iterate PR, tweak margins  
							
							 
							
							
							
						 
						
							2020-08-18 12:00:56 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4ec602b960 
								
							
								 
							
						 
						
							
							
								
								Make cutout in the decorated room avatar transparent rather than fixed  
							
							 
							
							
							
						 
						
							2020-08-14 10:20:59 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8aa50ecb59 
								
							
								 
							
						 
						
							
							
								
								Iterate rageshake download styling  
							
							 
							
							
							
						 
						
							2020-08-13 13:08:07 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								9e429ee669 
								
							
								 
							
						 
						
							
							
								
								Remove rebranding toast  
							
							 
							
							... 
							
							
							
							It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.
Fixes https://github.com/vector-im/element-web/issues/14931  
							
						 
						
							2020-08-11 14:27:53 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b30ce0355e 
								
							
								 
							
						 
						
							
							
								
								Factor out Iconized Context Menu for reusabilit  
							
							 
							
							
							
						 
						
							2020-08-04 21:42:39 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								db5121aeca 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-08-03 16:49:43 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								c5574219bb 
								
							
								 
							
						 
						
							
							
								
								Implement dialog for resending local echo transactions  
							
							 
							
							
							
						 
						
							2020-07-29 20:36:04 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								14757cacd5 
								
							
								 
							
						 
						
							
							
								
								Introduce a concept of "non-urgent" toasts  
							
							 
							
							... 
							
							
							
							This is somewhat expected to be temporary. 
							
						 
						
							2020-07-29 12:43:35 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								7f5c501b2b 
								
							
								 
							
						 
						
							
							
								
								CallView2 -> CallView  
							
							 
							
							
							
						 
						
							2020-07-17 15:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								cbf967ea69 
								
							
								 
							
						 
						
							
							
								
								Remove legacy call components  
							
							 
							
							
							
						 
						
							2020-07-17 15:53:13 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								c9b0b3b31d 
								
							
								 
							
						 
						
							
							
								
								RoomSublist2 -> RoomSublist  
							
							 
							
							
							
						 
						
							2020-07-17 15:46:46 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								96065ae982 
								
							
								 
							
						 
						
							
							
								
								RoomTile2 -> RoomTile  
							
							 
							
							
							
						 
						
							2020-07-17 15:43:29 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8dfe7b6cc7 
								
							
								 
							
						 
						
							
							
								
								RoomBreadcrumbs2 -> RoomBreadcrumbs  
							
							 
							
							
							
						 
						
							2020-07-17 15:32:06 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								a7c18bfbfa 
								
							
								 
							
						 
						
							
							
								
								RoomList2 -> RoomList  
							
							 
							
							
							
						 
						
							2020-07-17 15:27:49 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								2441cbc9ac 
								
							
								 
							
						 
						
							
							
								
								LeftPanel2 -> LeftPanel  
							
							 
							
							
							
						 
						
							2020-07-17 15:22:18 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								3c047cecfd 
								
							
								 
							
						 
						
							
							
								
								Remove core structures for the old room list  
							
							 
							
							
							
						 
						
							2020-07-17 14:17:11 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								38dc3c8bd1 
								
							
								 
							
						 
						
							
							
								
								Replace non-functional Interactive Tooltip  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-17 18:43:42 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d5f2d43429 
								
							
								 
							
						 
						
							
							
								
								Improve Tooltip font/layout consistency  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-16 15:15:00 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								503159c1c8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'  
							
							 
							
							... 
							
							
							
							Add in-app rebranding toasts & prompts
See merge request new-vector/element/element-web/matrix-react-sdk!1 
							
						 
						
							2020-07-10 17:09:17 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8701e9293e 
								
							
								 
							
						 
						
							
							
								
								Add in-app rebranding toasts & prompts  
							
							 
							
							... 
							
							
							
							Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar. 
							
						 
						
							2020-07-10 15:32:34 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								0d6e7759d0 
								
							
								 
							
						 
						
							
							
								
								Fix review details  
							
							 
							
							... 
							
							
							
							- spelling mistake
- unwatch watched setting
- lint (indentation)
- use more performant component 
							
						 
						
							2020-07-07 15:11:08 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								5176685d20 
								
							
								 
							
						 
						
							
							
								
								Implement incoming call box  
							
							 
							
							
							
						 
						
							2020-07-06 23:05:00 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								dcd51b5be3 
								
							
								 
							
						 
						
							
							
								
								Implement breadcrumb notifications and scrolling  
							
							 
							
							
							
						 
						
							2020-06-30 23:24:46 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								dafce40d1b 
								
							
								 
							
						 
						
							
							
								
								Rename UserMenuButton to UserMenu for new scope  
							
							 
							
							
							
						 
						
							2020-06-25 19:29:12 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								e4a51a7c01 
								
							
								 
							
						 
						
							
							
								
								Add presence icons; Convert to generic icon component  
							
							 
							
							... 
							
							
							
							For https://github.com/vector-im/riot-web/issues/14039  
							
						 
						
							2020-06-16 14:44:37 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								95b4abba3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4735  from matrix-org/travis/room-list/breadcrumbs  
							
							 
							
							... 
							
							
							
							Reimplement breadcrumbs for new room list 
							
						 
						
							2020-06-10 07:39:55 -06:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								0fb6846c9d 
								
							
								 
							
						 
						
							
							
								
								Radio buttons  
							
							 
							
							
							
						 
						
							2020-06-10 13:03:00 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9377fa513f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/breadcrumbs  
							
							 
							
							
							
						 
						
							2020-06-09 08:11:08 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								724f545b4a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges  
							
							 
							
							
							
						 
						
							2020-06-09 08:06:10 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								5114c37b82 
								
							
								 
							
						 
						
							
							
								
								Add filtering and exploring to the new room list  
							
							 
							
							... 
							
							
							
							This is per the designs. Animation doesn't feel required here.
Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem. 
							
						 
						
							2020-06-08 20:33:21 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9859891b4d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/sublist-badges  
							
							 
							
							
							
						 
						
							2020-06-08 18:12:43 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								bcc455b248 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/breadcrumbs  
							
							 
							
							
							
						 
						
							2020-06-08 18:11:42 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0354bf9b6d 
								
							
								 
							
						 
						
							
							
								
								Reimplement breadcrumbs for new room list  
							
							 
							
							... 
							
							
							
							This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.
The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.
This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed. 
							
						 
						
							2020-06-08 17:11:58 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								086b9101fa 
								
							
								 
							
						 
						
							
							
								
								Add sublist badge counts to new room list  
							
							 
							
							... 
							
							
							
							Also add IDLE state to rooms 
							
						 
						
							2020-06-08 13:42:18 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8e0247afe5 
								
							
								 
							
						 
						
							
							
								
								Add most of the UI for the new room list's menu button  
							
							 
							
							... 
							
							
							
							Incomplete implementation: buttons don't work, some text is missing, etc 
							
						 
						
							2020-06-07 22:06:41 -06:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								4521e9feb1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-06-07 15:12:30 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								4c1bc50649 
								
							
								 
							
						 
						
							
							
								
								Initial styling for new room list  
							
							 
							
							... 
							
							
							
							This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.
This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it. 
							
						 
						
							2020-06-04 16:41:18 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								dbf996439b 
								
							
								 
							
						 
						
							
							
								
								Wedge t3chguy's resizer prototype into the sublist  
							
							 
							
							
							
						 
						
							2020-06-03 21:17:51 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								936445ab2d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4660  from matrix-org/t3chguy/kill_UDE_and_UDD  
							
							 
							
							... 
							
							
							
							Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling 
							
						 
						
							2020-06-03 10:45:47 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								69747b6114 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/appearance-tab  
							
							 
							
							
							
						 
						
							2020-06-01 14:32:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								efd0da44a1 
								
							
								 
							
						 
						
							
							
								
								Give contextual feedback for manual update check instead of banner  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-29 18:24:45 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								66c0d53f3e 
								
							
								 
							
						 
						
							
							
								
								Create and use stylised checkboxes  
							
							 
							
							
							
						 
						
							2020-05-28 22:33:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8aaa7825ef 
								
							
								 
							
						 
						
							
							
								
								Also kill off things that these kept behind  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-28 17:12:19 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f0cabd55c0 
								
							
								 
							
						 
						
							
							
								
								Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling  
							
							 
							
							... 
							
							
							
							as we now always `setGlobalErrorOnUnknownDevices(false)`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-28 17:01:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								563a36e0a1 
								
							
								 
							
						 
						
							
							
								
								Remove unused CSS too  
							
							 
							
							
							
						 
						
							2020-05-26 13:42:00 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								4e5680de85 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-05-25 19:21:19 +03:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								6d9d4ee547 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/font-scaling-slider  
							
							 
							
							
							
						 
						
							2020-05-20 13:46:17 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								323d0762fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/irc-ui  
							
							 
							
							
							
						 
						
							2020-05-19 18:03:44 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								2e325191bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'nv/develop' into joriks/irc-ui  
							
							 
							
							
							
						 
						
							2020-05-19 17:18:36 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								1eea203db6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4599  from matrix-org/t3chguy/progress_colour  
							
							 
							
							... 
							
							
							
							Consolidate password/passphrase fields into a component & add dynamic colour to progress 
							
						 
						
							2020-05-18 11:08:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f2979f3fd8 
								
							
								 
							
						 
						
							
							
								
								replace zxcvbn field in CreateKeyBackupDialog with PassphraseField  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 20:59:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cf3c4d9e5f 
								
							
								 
							
						 
						
							
							
								
								Extract Password field from Registration into a reusable component  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 20:20:36 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								09a4af49f3 
								
							
								 
							
						 
						
							
							
								
								Consolidate zxcvbn progress bars into a component and add dynamic colour  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 18:49:55 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d1c6f3099c 
								
							
								 
							
						 
						
							
							
								
								move styling to QRCode scss  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-14 11:20:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6ff093f5a3 
								
							
								 
							
						 
						
							
							
								
								Bring back UnknownBody for UISIs  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-08 19:15:59 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								54d211a847 
								
							
								 
							
						 
						
							
							
								
								Index file name changes  
							
							 
							
							
							
						 
						
							2020-05-07 14:04:33 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								37e8dc0477 
								
							
								 
							
						 
						
							
							
								
								Include new css files  
							
							 
							
							
							
						 
						
							2020-05-07 14:04:33 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e16f511527 
								
							
								 
							
						 
						
							
							
								
								Redesign redactions  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-24 15:07:39 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								9a585fee0a 
								
							
								 
							
						 
						
							
							
								
								Move slider themes  
							
							 
							
							
							
						 
						
							2020-04-23 10:45:48 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								abd94a65bd 
								
							
								 
							
						 
						
							
							
								
								Move compoenets/FontSlider to views/Slider  
							
							 
							
							
							
						 
						
							2020-04-23 10:45:47 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								df73f12320 
								
							
								 
							
						 
						
							
							
								
								Make a font slider  
							
							 
							
							
							
						 
						
							2020-04-23 10:45:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								80b8120bc3 
								
							
								 
							
						 
						
							
							
								
								Update login security copy and design to match Figma  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-22 22:32:02 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								aef6687931 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4406  from matrix-org/bwindels/completesecuritywithoutspinner  
							
							 
							
							... 
							
							
							
							Fix: don't confuse user with spinner during complete security step 
							
						 
						
							2020-04-14 15:54:44 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								db09cadb66 
								
							
								 
							
						 
						
							
							
								
								remove spinner, change copy, add button placeholder  
							
							 
							
							
							
						 
						
							2020-04-14 17:19:15 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3e057070fd 
								
							
								 
							
						 
						
							
							
								
								Fix width of MVideoBody in FilePanel  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-12 00:56:21 +01:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								25af26323c 
								
							
								 
							
						 
						
							
							
								
								Make image reply rendering even more compact  
							
							 
							
							
							
						 
						
							2020-04-10 15:45:59 +03:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								26a4a23a33 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-04-10 13:56:01 +03:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								202ad9f98a 
								
							
								 
							
						 
						
							
							
								
								Remove sort and include new scss file in components  
							
							 
							
							
							
						 
						
							2020-04-02 13:42:59 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								25e7bde7bc 
								
							
								 
							
						 
						
							
							
								
								Add a flag to control whether cross-signing signatures are trusted  
							
							 
							
							... 
							
							
							
							Fixes: https://github.com/vector-im/riot-web/issues/12616  
							
						 
						
							2020-03-25 18:38:12 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d593a76f28 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd  
							
							 
							
							
							
						 
						
							2020-03-18 20:41:13 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cad28c81c0 
								
							
								 
							
						 
						
							
							
								
								Add Keyboard shortcuts dialog  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-18 16:40:21 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a9f414dafe 
								
							
								 
							
						 
						
							
							
								
								Remove unused SearchableEntityList.js  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-13 23:23:23 +00:00  
						
					 
				
					
						
							
							
								 
								Tulir Asokan
							
						 
						
							 
							
							
							
								
							
								a8c5574bc8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering  
							
							 
							
							
							
						 
						
							2020-03-05 13:19:15 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								39e9bffe1f 
								
							
								 
							
						 
						
							
							
								
								Make encryption events into bubble-style tiles  
							
							 
							
							... 
							
							
							
							Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/
Fixes https://github.com/vector-im/riot-web/issues/12006  
							
						 
						
							2020-01-30 20:03:26 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								76e61b9948 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/cs_verification_decoration' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/cs_verification_decoration  
							
							 
							
							
							
						 
						
							2020-01-28 17:19:59 +00:00  
						
					 
				
					
						
							
							
								 
								Half-Shot
							
						 
						
							 
							
							
							
								
							
								ff532dd684 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty  
							
							 
							
							
							
						 
						
							2020-01-28 16:01:50 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								dea919f6ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3953  from matrix-org/jryans/verif-toast-details-2  
							
							 
							
							... 
							
							
							
							Add new session verification details dialog 
							
						 
						
							2020-01-28 11:50:03 +00:00