Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								dc2d52c1f2 
								
									
								
							
								 
							
						 
						
							
							
								
								a11y - wrap notification level radios in fieldsets ( #7471 )  
							
							 
							
							... 
							
							
							
							* notification settings radios table -> fieldset
Signed-off-by: Kerry Archibald <kerrya@element.io>
* aria-label for inputs
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update tests for fielset
Signed-off-by: Kerry Archibald <kerrya@element.io>
* remove unneccessary wrapping div
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix stylelint
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-01-06 18:52:06 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								b1066a5699 
								
									
								
							
								 
							
						 
						
							
							
								
								Wrap inputs in fieldsets in Space visibility settings ( #7350 )  
							
							 
							
							... 
							
							
							
							* use fieldset in space settings > visibility
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add basic tests for space setttings visibility
Signed-off-by: Kerry Archibald <kerrya@element.io>
* i18n
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix toggle button placement
Signed-off-by: Kerry Archibald <kerrya@element.io>
* i18n
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update settings separator color to quinary
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-01-06 10:09:26 +00:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								92ee02fe02 
								
									
								
							
								 
							
						 
						
							
							
								
								unit test Notifications.tsx ( #7468 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-01-06 09:47:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								7f13a1b40a 
								
									
								
							
								 
							
						 
						
							
							
								
								Attribute fallback i18n strings with lang attribute ( #7323 )  
							
							 
							
							... 
							
							
							
							* add lang attribute to fallback translations
Signed-off-by: Kerry Archibald <kerrya@element.io>
* readability improvement
Signed-off-by: Kerry Archibald <kerrya@element.io>
* split _t and _tDom
Signed-off-by: Kerry <kerry@Kerrys-MBP.fritz.box>
* use tDom in HomePage
Signed-off-by: Kerry Archibald <kerrya@element.io>
* lint
Signed-off-by: Kerry Archibald <kerrya@element.io>
* bump matrix-web-i18n
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-01-05 11:37:28 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								03f5a3c3e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Associate room alias warning with public option in settings ( #7430 )  
							
							 
							
							... 
							
							
							
							* add describedby to styledradiogroup description
Signed-off-by: Kerry Archibald <kerrya@element.io>
* alias warning in description
Signed-off-by: Kerry Archibald <kerrya@element.io>
* lint
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update snapshot
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2022-01-03 09:55:09 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								b412067b24 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix nulls leaking into geo urls ( #7433 )  
							
							 
							
							
							
						 
						
							2021-12-21 16:56:28 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								a239c456e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow opening a map view in OpenStreetMap ( #7428 )  
							
							 
							
							
							
						 
						
							2021-12-21 15:48:20 +00:00  
						
					 
				
					
						
							
							
								 
								Renan Cleyson
							
						 
						
							 
							
							
								
								
							
							
								
							
								9ac85bcaa3 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix list formatting alternating on edit ( #7422 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-12-21 10:07:44 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								8b2a478a25 
								
									
								
							
								 
							
						 
						
							
							
								
								Update location text fallback and test it ( #7408 )  
							
							 
							
							
							
						 
						
							2021-12-21 09:37:06 +00:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								61e3c38b19 
								
									
								
							
								 
							
						 
						
							
							
								
								Add configuration to disable relative date markers in timeline ( #7405 )  
							
							 
							
							... 
							
							
							
							* add disabler elative dates setting
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test existing DateSeparator
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use full date format when TimelineDisableRelativeDates is truthy
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add comment
Signed-off-by: Kerry Archibald <kerrya@element.io>
* flip timelineDisableRelativeDates -> timelineEnableRelativeDates to fit convention
Signed-off-by: Kerry Archibald <kerrya@element.io>
* mock date constructor in test
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-21 10:08:22 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b90a0c443d 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix end-to-end tests (synapse setup) ( #7420 )  
							
							 
							
							... 
							
							
							
							* Update install.sh
* Update install.sh
* Update develop.yml
* Update install.sh
* Update develop.yml
* Update install.sh
* Update install.sh
* Work around suspected frozendict bug
* Faff around with install-webserver.sh
* Actually I don't think these clash anyway
* Minor cleanup
* Add comments
Co-authored-by: Olivier <olivier@librepush.net> 
							
						 
						
							2021-12-21 02:12:07 +00:00  
						
					 
				
					
						
							
							
								 
								Eric Eastwood
							
						 
						
							 
							
							
								
								
							
							
								
							
								9289c0c90f 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor `ContextMenu` to use `RovingTabIndex` (more consistent keyboard navigation accessibility) ( #7353 )  
							
							 
							
							... 
							
							
							
							Split off from https://github.com/matrix-org/matrix-react-sdk/pull/7339  
							
						 
						
							2021-12-17 11:08:56 -06:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								670d7824ec 
								
									
								
							
								 
							
						 
						
							
							
								
								Tidy location code ( #7402 )  
							
							 
							
							
							
						 
						
							2021-12-17 12:26:02 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								bd226cd062 
								
									
								
							
								 
							
						 
						
							
							
								
								Tests for getGeoUri ( #7400 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-12-17 10:58:24 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								144e4c61fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Avoid NaNs in parseGeoUri return ( #7396 )  
							
							 
							
							
							
						 
						
							2021-12-17 09:50:27 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								39c4b78371 
								
									
								
							
								 
							
						 
						
							
							
								
								Space preferences for whether or not you see DMs in a Space ( #7250 )  
							
							 
							
							
							
						 
						
							2021-12-17 09:26:32 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								9a8265429c 
								
									
								
							
								 
							
						 
						
							
							
								
								Unit tests for parseGeoUri ( #7395 )  
							
							 
							
							
							
						 
						
							2021-12-16 14:20:55 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								43839adec0 
								
									
								
							
								 
							
						 
						
							
							
								
								Use constants from js-sdk in polls code ( #7381 )  
							
							 
							
							
							
						 
						
							2021-12-15 14:26:26 +00:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								46b0865e89 
								
									
								
							
								 
							
						 
						
							
							
								
								Add Heading components ( #7362 )  
							
							 
							
							... 
							
							
							
							* add Heading components
Signed-off-by: Kerry Archibald <kerrya@element.io>
* remove margins
Signed-off-by: Kerry Archibald <kerrya@element.io>
* snapshots
Signed-off-by: Kerry Archibald <kerrya@element.io>
* unset block and inline margins
Signed-off-by: Kerry Archibald <kerrya@element.io>
* copyright
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix werid quoting on heading test
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-15 11:00:10 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								fcc4939075 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix naming of set-theory utils to match convention ( #7343 )  
							
							 
							
							
							
						 
						
							2021-12-13 10:57:51 +00:00  
						
					 
				
					
						
							
							
								 
								Dominik Henneke
							
						 
						
							 
							
							
								
								
							
							
								
							
								908e938996 
								
									
								
							
								 
							
						 
						
							
							
								
								Keep all previously approved widget capabilities when requesting new capabilities ( #7340 )  
							
							 
							
							
							
						 
						
							2021-12-13 10:34:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								5554d7fdc1 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't send a poll response event if you are voting for your current c… ( #7326 )  
							
							 
							
							
							
						 
						
							2021-12-10 12:36:53 +00:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								a727961c43 
								
									
								
							
								 
							
						 
						
							
							
								
								Adding missing TypeScript dependency ( #7330 )  
							
							 
							
							
							
						 
						
							2021-12-10 12:28:44 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								fc96af5014 
								
									
								
							
								 
							
						 
						
							
							
								
								Show poll question in message preview ( #7320 )  
							
							 
							
							
							
						 
						
							2021-12-10 12:17:26 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								914b61239c 
								
									
								
							
								 
							
						 
						
							
							
								
								Spotlight search labs ( #7116 )  
							
							 
							
							
							
						 
						
							2021-12-10 11:50:01 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8a0398b632 
								
							
								 
							
						 
						
							
							
								
								Fix remaining import ordering requirements  
							
							 
							
							
							
						 
						
							2021-12-09 16:09:20 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								e4b96cff1f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'aaronraimist/sort-imports' into develop  
							
							 
							
							
							
						 
						
							2021-12-09 16:03:59 -07:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								2e3f225520 
								
									
								
							
								 
							
						 
						
							
							
								
								Put room settings form elements in fieldsets ( #7311 )  
							
							 
							
							... 
							
							
							
							* override default fieldset styles
Signed-off-by: Kerry Archibald <kerrya@element.io>
* SettingsFieldset component
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test settings fieldset
Signed-off-by: Kerry Archibald <kerrya@element.io>
* refactor SettingsFlag styles
* use SettingsFieldset in room > securit settings
* use fieldset in urlpreviewsettings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use SettingsFieldset in AliasSettings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fieldset in room > roles settings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* css lint
Signed-off-by: Kerry Archibald <kerrya@element.io>
* run i18n
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fussy order
Signed-off-by: Kerry Archibald <kerrya@element.io>
* default export
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix copyright headers
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-09 18:44:22 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								3c1ee204a0 
								
									
								
							
								 
							
						 
						
							
							
								
								default export for TooltipTarget ( #7319 )  
							
							 
							
							... 
							
							
							
							* default export for TooltipTarget
Signed-off-by: Kerry Archibald <kerrya@element.io>
* newline
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-09 13:36:55 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								1216285ed2 
								
									
								
							
								 
							
						 
						
							
							
								
								Add descriptions to ambiguous links for screen readers ( #7310 )  
							
							 
							
							... 
							
							
							
							* add title to room share link
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add ExternalLink component
Signed-off-by: Kerry Archibald <kerrya@element.io>
* unit test ExternalLink
Signed-off-by: Kerry Archibald <kerrya@element.io>
* default target and rel for external link
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use scss $font variables
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-09 13:04:06 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								d7a6e3ec65 
								
									
								
							
								 
							
						 
						
							
							
								
								Correct tab order in room preview dialog ( #7302 )  
							
							 
							
							... 
							
							
							
							* tab order
* lint fixes
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test RoomPreviewBar
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add copyright header
Signed-off-by: Kerry Archibald <kerrya@element.io>
* Update src/components/views/rooms/RoomPreviewBar.tsx
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
* fix tabs/spaces lint for reformatted actions
Signed-off-by: Kerry Archibald <kerrya@element.io>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-12-09 11:48:58 +01:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								0c850b2f13 
								
									
								
							
								 
							
						 
						
							
							
								
								Make tooltips keyboard accessible ( #7281 )  
							
							 
							
							... 
							
							
							
							* show tooltips on hover in eventtile
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use tooltip props pass thru
* use tooltiptarget in InfoTooltip
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use target in TestWithTooltip
Signed-off-by: Kerry Archibald <kerrya@element.io>
* tsc fixes
Signed-off-by: Kerry Archibald <kerrya@element.io>
* test tooltip target
Signed-off-by: Kerry Archibald <kerrya@element.io>
* lint fix
Signed-off-by: Kerry Archibald <kerrya@element.io>
* rename tooltip handlers
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update copyright to 2021
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-09 11:47:50 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								5b293dd6df 
								
							
								 
							
						 
						
							
							
								
								Remove files created by merge  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-12-09 09:21:12 +00:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								2e8a93834b 
								
							
								 
							
						 
						
							
							
								
								Auto fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-12-09 09:10:23 +00:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								7b94e13a84 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into sort-imports  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-12-09 08:34:20 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								2b52e17a80 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow ending polls ( #7305 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-12-08 14:56:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kerry
							
						 
						
							 
							
							
								
								
							
							
								
							
								697b5d28b3 
								
									
								
							
								 
							
						 
						
							
							
								
								fix leaking registration test ( #7304 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 
						
							2021-12-08 10:34:24 +01:00  
						
					 
				
					
						
							
							
								 
								Renan Cleyson
							
						 
						
							 
							
							
								
								
							
							
								
							
								b4b81a455e 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix wrong indentation with nested ordered list unnesting list on edit ( #7300 )  
							
							 
							
							
							
						 
						
							2021-12-07 09:46:04 +00:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								43f264ccfc 
								
									
								
							
								 
							
						 
						
							
							
								
								Integrate analytics stubs ( #7186 )  
							
							 
							
							... 
							
							
							
							* Add matrix-analytics-events as a dependency
* Make IEvent look like a stub definition
* Update pageview tracking to track screens, using a hypothetical definition of a screen event
* Remove distinction between pseudo and anon tracking, will need to rework it considering stubs 
							
						 
						
							2021-12-06 21:43:42 +11:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								1262021417 
								
									
								
							
								 
							
						 
						
							
							
								
								Simple static location sharing ( #7135 )  
							
							 
							
							... 
							
							
							
							Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md ) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.
For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`. 
							
						 
						
							2021-12-06 09:45:12 +00:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								d4813f7a1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert end-to-end tests to Typescript ( #7206 )  
							
							 
							
							
							
						 
						
							2021-12-06 09:59:06 +11:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								5219b6be80 
								
									
								
							
								 
							
						 
						
							
							
								
								Analytics opt in for posthog ( #6936 )  
							
							 
							
							... 
							
							
							
							* Add a new flag pseudonymousAnalyticsOptIn replacing analyticsOptIn, stored at account level, so people only need to opt in once.
* Show a toast in login to users that have analyticsOptIn set but not yet pseudonymousAnalyticsOptIn prompting them confirm the new method is okay. Update the copy of the existing opt-in toast. Don't notify users that previously opted out.
* Update the copy in settings
* Add a new learn more dialog
* Support a new config flag analyticsOwner which is used in these toasts when explaining which entity the data is sent to ("Help improve %(analyticsOwner)"). If unset, display brand. This allows deployments whose brand differs from the receiver of the analytics to explain the situation to their users (e.g. AcmeCorp badges their app, but explains the data is sent to Element, not them)
* The new opt-in and flags are only used when posthog is configured; prior to that there are no changes to UX or tracking behaviour. 
							
						 
						
							2021-12-06 09:39:33 +11:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								961fec9081 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor matrix-linkify module ( #7279 )  
							
							 
							
							... 
							
							
							
							Refactor the module to make it easier for upgrade and proper separation of code contexts 
							
						 
						
							2021-12-03 14:00:56 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								3b9e39ffca 
								
									
								
							
								 
							
						 
						
							
							
								
								When accepting DM from People metaspace don't switch to Home ( #7272 )  
							
							 
							
							
							
						 
						
							2021-12-03 11:17:51 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								494af883f3 
								
									
								
							
								 
							
						 
						
							
							
								
								Hide votes in a poll until you voted ( #7269 )  
							
							 
							
							
							
						 
						
							2021-12-03 10:26:28 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								141950d9e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Ensure my votes from a different device show up ( #7233 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2021-12-02 17:12:18 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								25c119dd5a 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert  https://github.com/matrix-org/matrix-react-sdk/pull/7246  ( #7268 )  
							
							 
							
							... 
							
							
							
							This is apprently fixed on synapse, so reverting the workaround 
							
						 
						
							2021-12-02 16:31:23 +00:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								fda0c2cf79 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix markdown formatting for bold ( #7257 )  
							
							 
							
							... 
							
							
							
							* Fix markdown formatting for bold
Fix https://github.com/vector-im/element-web/issues/4674 
* I hate you too eslint 
							
						 
						
							2021-12-02 10:56:23 +00:00  
						
					 
				
					
						
							
							
								 
								Renan Cleyson
							
						 
						
							 
							
							
								
								
							
							
								
							
								0afe141266 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix textual message stripping new line ( #7239 )  
							
							 
							
							
							
						 
						
							2021-12-02 09:25:12 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								4a6d46b76a 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace breadcrumbs with recently viewed menu ( #7073 )  
							
							 
							
							
							
						 
						
							2021-12-01 10:50:06 +00:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								2e82887dc2 
								
									
								
							
								 
							
						 
						
							
							
								
								Make e2e tests pass in CI by using an older Synapse version ( #7246 )  
							
							 
							
							
							
						 
						
							2021-12-01 09:53:57 +00:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								cbb34d8ac7 
								
									
								
							
								 
							
						 
						
							
							
								
								Make `CallHandler` more `EventEmitter`y ( #6704 )  
							
							 
							
							... 
							
							
							
							* sharedInstance() -> instance
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use CallState event instead of dispatching
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Simplifie some code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use a method to start a call instead of the dispatcher
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use a method instead of place_conference_call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Make terminateCallApp() and hangupCallApp() public
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use hangupAllCalls() instead of the dispatcher
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Make dialNumber(), startTransferToMatrixID() and startTransferToPhoneNumber() public instead of using the dispatcher
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use answerCall() instead of using the dispatcher
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Use hangupOrReject() instead of the dispatcher
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Update docs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Improve TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Dispatch call_state, see https://github.com/vector-im/element-web/pull/18823#issuecomment-917377277 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Add missing import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-11-30 18:09:13 +00:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								e3187ed15c 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix links being parsed as markdown links improperly ( #7200 )  
							
							 
							
							... 
							
							
							
							* Fix links being parsed as markdown links improperly
Fixes  #4674 
* Fix a typo
* Fix overriding too much stuff
* Fix parsing
* Remove useless console.log
* Remove unnecessary emph function
* Properly fix tests
* Add some better docs
* Add missing license header 
							
						 
						
							2021-11-30 18:09:05 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								8fe582b094 
								
									
								
							
								 
							
						 
						
							
							
								
								Tweaks to informational architecture 1.1 ( #7052 )  
							
							 
							
							... 
							
							
							
							* Move user avatar to Space panel
* Add room list header for 'Home' or 'Space Name' to room list
Add existing Space context menus to room list header
* Re-add pending room join spinner
* Iterate RoomListHeader plus context menu
* Iterate space context menu
* Iterate room list + interactions
* Move DND to new iA model
* Replace composer custom status management with usermenu one
* Cull Quick Actions
* Iterate minimized room list state
* delint
* Merge the RoomListNumResults into the RoomListHeader
* Make the search shortcut prompt semi-bold
* Iterate RoomListHeader based on design review
* Iterate UserMenu based on feedback
* Add name to expanded spacepanel usermenu button
* i18n
* Make room sub list aux button components more generic
* Change left panel explore button to only refer to room directory
* Iterate RoomListHeader
* Fix custom user status input field width in Chrome
* Bring back Notification settings button
* delint
* i18n
* post-merge fix
* iterate pr
* Remove unused state
* update copy
* Apply suggestions from PR review
* delint
* Update invite iconography
* Iterate Space context menu to match Figma
* Fix chevron alignment
* Fix edge case for RoomListHeader on metaspaces
* Wire up general rageshake-driven feedback mechanism
* Add IA1.1 info toast
* add missing alt attribute
* delint
* delint
* tweak ia toast priority
* e2e test account for new toast
* autofocus feedback field and remove old subheading
* tweak copy
* Iterate space panel colours to match Figma
* Iterate PR
* delint
* Fix feedback submission with object setting values
* iterate based on review
* Tweak colours and update splash image
* Tweaks based on review
* Remove room list prompt, made redundant by the big fat `+`
* Fix edge cases around User Menu positioning and dnd
* Add missing import, bad merge?
* Update aria label in e2e test
* Fix room list space rooms context menu explore button behaviour
* Tweak copy
* Revert order of options in the UserMenu
* Tweak copy
* i18n 
							
						 
						
							2021-11-30 18:08:46 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								fe24c8ad2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve ThreadPanel ctx menu accessibility ( #7217 )  
							
							 
							
							
							
						 
						
							2021-11-29 17:42:53 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								9727a82a12 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow filtering room list during treeview navigation ( #7219 )  
							
							 
							
							
							
						 
						
							2021-11-29 17:18:35 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								138f6685d4 
								
									
								
							
								 
							
						 
						
							
							
								
								re-enable Spaces e2e tests ( #7207 )  
							
							 
							
							
							
						 
						
							2021-11-26 11:45:31 +00:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								d256af775d 
								
									
								
							
								 
							
						 
						
							
							
								
								Add basic linkify-matrix tests ( #7199 )  
							
							 
							
							... 
							
							
							
							Add basic linkify-matrix tests 
							
						 
						
							2021-11-26 10:39:07 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								1c6703356d 
								
									
								
							
								 
							
						 
						
							
							
								
								Highlight my vote even if it was made on another device ( #7202 )  
							
							 
							
							
							
						 
						
							2021-11-26 09:24:34 +00:00  
						
					 
				
					
						
							
							
								 
								Renan Cleyson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ae0dba4e87 
								
									
								
							
								 
							
						 
						
							
							
								
								Add `view_room` to `Action` enum ( #7203 )  
							
							 
							
							... 
							
							
							
							* Add ViewRoom action to Action enum
Signed-off-by: Renan <renancleyson.f@gmail.com>
* Change view_room occurrences to Action.ViewRoom
Signed-off-by: Renan <renancleyson.f@gmail.com>
* Add missing Action import 
							
						 
						
							2021-11-25 21:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								ea97c416f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Test for showing a spinner after submitting a new poll ( #7194 )  
							
							 
							
							
							
						 
						
							2021-11-24 16:24:19 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								d7f3d2791a 
								
									
								
							
								 
							
						 
						
							
							
								
								Basic tests for PollCreateDialog ( #7193 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-11-24 13:48:07 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								08cd8926e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix a couple relative date tests ( #7184 )  
							
							 
							
							
							
						 
						
							2021-11-23 11:29:23 -07:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								359962af6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Prevent text overlapping on poll options ( #7187 )  
							
							 
							
							
							
						 
						
							2021-11-23 11:16:31 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								d705fdd6e4 
								
									
								
							
								 
							
						 
						
							
							
								
								Display and send votes in polls ( #7158 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2021-11-23 10:27:44 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								3c06e7f7a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Add option to change the size of images/videos in the timeline ( #7017 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Timo K <toger5@hotmail.de> 
							
						 
						
							2021-11-17 15:19:30 +00:00  
						
					 
				
					
						
							
							
								 
								Timo
							
						 
						
							 
							
							
								
								
							
							
								
							
								556cfc7ed8 
								
									
								
							
								 
							
						 
						
							
							
								
								Add maximise widget functionality ( #7098 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2021-11-16 15:43:18 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								27c3153947 
								
									
								
							
								 
							
						 
						
							
							
								
								Unified room context menus ( #7072 )  
							
							 
							
							
							
						 
						
							2021-11-15 11:39:25 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								5ad3261cb2 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement more meta-spaces ( #7077 )  
							
							 
							
							
							
						 
						
							2021-11-11 13:07:41 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c8e1d32e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename mx_RadioButton to mx_StyledRadioButton to match class name ( #7083 )  
							
							 
							
							
							
						 
						
							2021-11-04 12:57:38 +00:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								7a203461f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix TimeZone to be UTC in Jest tests ( #7082 )  
							
							 
							
							
							
						 
						
							2021-11-04 10:39:49 +00:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								38750202ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Design thread list tiles according to mockups ( #7078 )  
							
							 
							
							
							
						 
						
							2021-11-03 18:05:01 +00:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								2a20d9a7df 
								
									
								
							
								 
							
						 
						
							
							
								
								Display relative time in thread panel event tile ( #7068 )  
							
							 
							
							... 
							
							
							
							* Null-guard for missing root event in thread panel
* Add formatRelativeTime date utility
* Display relative time format in thread panel event tiles 
							
						 
						
							2021-11-03 10:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Faye Duxovni
							
						 
						
							 
							
							
								
								
							
							
								
							
								71244f3b3c 
								
									
								
							
								 
							
						 
						
							
							
								
								Add more checkbox styles ( #7058 )  
							
							 
							
							... 
							
							
							
							Add a "kind" param for StyledCheckbox, allowing designers to choose different styles of checkbox as needed.  In addition to the preexisting default kind (now called Solid), there's an Outline kind with a green checkmark and a transparent fill.  This is used in the device trust view, since the default checkbox style looks too much like the green "verified" shield and it's awkward to have those next to each other. 
							
						 
						
							2021-10-29 21:57:32 -04:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								d0bb6e0657 
								
									
								
							
								 
							
						 
						
							
							
								
								Unit tests for getEffectiveTheme ( #7051 )  
							
							 
							
							... 
							
							
							
							* Unit tests for getEffectiveTheme
* Unit tests for choosing high-contrast theme 
							
						 
						
							2021-10-29 09:11:55 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								f3867ad0a9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into sort-imports  
							
							 
							
							
							
						 
						
							2021-10-27 21:50:56 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								04c06b6aa8 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve RovingTabIndex & Room List filtering performance ( #6987 )  
							
							 
							
							
							
						 
						
							2021-10-26 12:16:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								be0fa6da7b 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix removing a room from a Space and interaction with `m.space.parent` ( #6944 )  
							
							 
							
							
							
						 
						
							2021-10-25 14:06:00 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								027b3660bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Manual fixes  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-10-22 17:49:12 -05:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								bdc56be863 
								
									
								
							
								 
							
						 
						
							
							
								
								Auto fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-10-22 17:23:37 -05:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								4b903b9fbd 
								
									
								
							
								 
							
						 
						
							
							
								
								Break ThemeChoicePanel into a separate component ( #6998 )  
							
							 
							
							... 
							
							
							
							* Break ThemeChoicePanel into a separate component
* Tests for ThemeChoicePanel
* i18n fixes
* Fix copyright for ThemeChoicePanel 
							
						 
						
							2021-10-20 14:58:27 +00:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
								
								
							
							
								
							
								96bd052ecf 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve visibility of font size chooser ( #6988 )  
							
							 
							
							... 
							
							
							
							* Improve visibility of font size chooser
* Move slider dot sizes into variables
* Use a standard font size instead of percentage in Slider
* Use shorthand for padding in FontScalingPanel
* Change Slider text pos to px to be consistent when font changes
* Cleaner dot size for Slider selection 
							
						 
						
							2021-10-20 13:41:27 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								694ec946e2 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow quote-reply in thread view element-web ( #6959 )  
							
							 
							
							
							
						 
						
							2021-10-19 16:05:34 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								2582f6df23 
								
							
								 
							
						 
						
							
							
								
								Replace manual mock with jest.mock  
							
							 
							
							
							
						 
						
							2021-10-19 15:45:11 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								4ad32b16ea 
								
							
								 
							
						 
						
							
							
								
								Break out font size settings to a separate component  
							
							 
							
							
							
						 
						
							2021-10-19 14:50:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								77e6e1c0ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6960  from matrix-org/gsouquet/rename-replythread  
							
							 
							
							
							
						 
						
							2021-10-18 17:11:31 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								5a7c0d87b6 
								
							
								 
							
						 
						
							
							
								
								Rename ReplyThread to ReplyChain to avoid confusion with m.thread  
							
							 
							
							
							
						 
						
							2021-10-15 17:42:44 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								a547ee4654 
								
							
								 
							
						 
						
							
							
								
								Break 'Cryptography' settings into a separate component  
							
							 
							
							
							
						 
						
							2021-10-15 16:02:44 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								c31bd8c647 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary adapter in ThreadPanel-test.tsx ( #6946 )  
							
							 
							
							
							
						 
						
							2021-10-14 15:42:54 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								562a880c7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Create room threads list view  ( #6904 )  
							
							 
							
							... 
							
							
							
							Implement https://github.com/vector-im/element-web/issues/18957  following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads
In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements 
							
						 
						
							2021-10-14 15:27:35 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								bc336abf47 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix missing snapshot serializer&enzyme init ( #6932 )  
							
							 
							
							
							
						 
						
							2021-10-13 11:09:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								82ad85a974 
								
							
								 
							
						 
						
							
							
								
								Mock usage of getRoomUpgradeHistory in SpaceStore tests  
							
							 
							
							
							
						 
						
							2021-10-08 10:30:46 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								e8dba59b42 
								
							
								 
							
						 
						
							
							
								
								Fix review comments from Šimon Brandner.  
							
							 
							
							... 
							
							
							
							Rename test->it; Rename users->userIds; Un-break a line.
Signed-off-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-10-04 11:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Andy Balaam
							
						 
						
							 
							
							
							
								
							
								226131409f 
								
							
								 
							
						 
						
							
							
								
								Unit tests for room avatars in DM and non-DM rooms  
							
							 
							
							... 
							
							
							
							Signed-off-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-10-01 15:08:19 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								1331e960fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Add ability to properly edit messages in Threads. ( #6877 )  
							
							 
							
							... 
							
							
							
							* Fix infinite rerender loop when editing message
* Refactor "edit_event" to Action.EditEvent
* Make up-arrow edit working in Threads
* Properly handle timeline events edit state
* Properly traverse messages to be edited
* Add MatrixClientContextHOC
* Refactor RoomContext to use AppRenderingContext
* Typescriptify test
Co-authored-by: Germain <germains@element.io> 
							
						 
						
							2021-10-01 15:35:54 +02:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								94e4fb71c1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop'  into export-conversations  
							
							 
							
							
							
						 
						
							2021-09-22 18:07:01 +05:30  
						
					 
				
					
						
							
							
								 
								Eric Eastwood
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c3439a1aa 
								
									
								
							
								 
							
						 
						
							
							
								
								Show updated relation reply from edited message - v2 ( #6817 )  
							
							 
							
							... 
							
							
							
							Part of https://github.com/vector-im/element-web/issues/10391 
When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.
ex.
```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
``` 
							
						 
						
							2021-09-17 15:18:52 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e17318a364 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							
							
						 
						
							2021-09-16 10:05:20 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								839fdbca62 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2021-09-15 13:55:34 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								76c782c64c 
								
							
								 
							
						 
						
							
							
								
								Remove all room data from tracking  
							
							 
							
							... 
							
							
							
							Always redact room fragments entirely; remove room utils 
							
						 
						
							2021-09-15 12:58:26 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								79f03dfec3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id  
							
							 
							
							
							
						 
						
							2021-09-15 09:52:15 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								c2192a78bc 
								
							
								 
							
						 
						
							
							
								
								More lint  
							
							 
							
							
							
						 
						
							2021-09-14 18:16:48 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								7344a177e3 
								
							
								 
							
						 
						
							
							
								
								Fix tests, swallow errors  
							
							 
							
							
							
						 
						
							2021-09-14 17:35:32 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								554c8ba74e 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2021-09-10 11:01:01 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								456de355f9 
								
							
								 
							
						 
						
							
							
								
								fix e2e test  
							
							 
							
							
							
						 
						
							2021-09-10 10:48:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								41118b418f 
								
							
								 
							
						 
						
							
							
								
								fix expected number of radios  
							
							 
							
							
							
						 
						
							2021-09-10 09:52:54 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								911ca07da4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							
							
						 
						
							2021-09-08 15:28:58 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c915288044 
								
							
								 
							
						 
						
							
							
								
								Respect m.space.parent relations if they hold valid permissions  
							
							 
							
							
							
						 
						
							2021-09-06 14:34:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a688e5b8b3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-09-06 11:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								60e2d61d25 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6489  from psrpinto/better-pinned-messages  
							
							 
							
							... 
							
							
							
							When pinning or unpinning messages, link to the specific message 
							
						 
						
							2021-09-03 13:27:49 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								de01dcfd26 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6700  from SimonBrandner/feature/call-timer/18566  
							
							 
							
							... 
							
							
							
							Show call length during a call 
							
						 
						
							2021-09-03 17:17:36 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								9be9e75c13 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6720  from matrix-org/gsouquet/replies-fix-18717  
							
							 
							
							
							
						 
						
							2021-09-02 08:42:54 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								95d1b06abb 
								
							
								 
							
						 
						
							
							
								
								Make composer able to reply in thread or in room timeline  
							
							 
							
							
							
						 
						
							2021-09-01 12:12:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bbd420096b 
								
							
								 
							
						 
						
							
							
								
								don't bother awaiting SpaceStore::setActiveSpace as it is no longer async  
							
							 
							
							
							
						 
						
							2021-08-31 17:03:43 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c107ae615 
								
									
								
							
								 
							
						 
						
							
							
								
								Add tests for formatSeconds()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-27 16:20:29 +02:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								7207329c15 
								
							
								 
							
						 
						
							
							
								
								Apply review suggestions  
							
							 
							
							
							
						 
						
							2021-08-13 23:44:07 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8e7ef39db7 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2021-08-13 15:51:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9d909dcdf8 
								
							
								 
							
						 
						
							
							
								
								tweaks  
							
							 
							
							
							
						 
						
							2021-08-13 15:44:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2509c864e0 
								
							
								 
							
						 
						
							
							
								
								tweak order of e2e tests  
							
							 
							
							
							
						 
						
							2021-08-13 13:46:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6ce518cb8f 
								
							
								 
							
						 
						
							
							
								
								add more delay  
							
							 
							
							
							
						 
						
							2021-08-13 13:38:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								5e38b8b3b3 
								
							
								 
							
						 
						
							
							
								
								try fix tests s'more  
							
							 
							
							
							
						 
						
							2021-08-13 13:29:25 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								9cbdc4a613 
								
							
								 
							
						 
						
							
							
								
								Use throw error instead of try-catch  
							
							 
							
							
							
						 
						
							2021-08-13 08:34:54 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								edfc8af6cf 
								
							
								 
							
						 
						
							
							
								
								Apply PR Suggestions  
							
							 
							
							
							
						 
						
							2021-08-13 08:30:50 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f2becd9698 
								
							
								 
							
						 
						
							
							
								
								Fix e2e test  
							
							 
							
							
							
						 
						
							2021-08-12 15:59:24 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0a209afdc2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089  
							
							 
							
							... 
							
							
							
							 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-08-12 11:41:03 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8216a35a56 
								
							
								 
							
						 
						
							
							
								
								remove spurious mxclient stub  
							
							 
							
							
							
						 
						
							2021-08-11 21:02:30 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								29e5a69b7a 
								
							
								 
							
						 
						
							
							
								
								delint e2e test  
							
							 
							
							
							
						 
						
							2021-08-11 16:24:32 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d602dac7ef 
								
							
								 
							
						 
						
							
							
								
								Add basic spaces tests to the e2e suite  
							
							 
							
							
							
						 
						
							2021-08-11 16:20:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6b9dc40ad6 
								
							
								 
							
						 
						
							
							
								
								delint test  
							
							 
							
							
							
						 
						
							2021-08-11 16:12:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								da110855f0 
								
							
								 
							
						 
						
							
							
								
								delint and remove groups-specific tests and setups  
							
							 
							
							
							
						 
						
							2021-08-11 15:36:35 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								aaeb9969a4 
								
							
								 
							
						 
						
							
							
								
								Handle case where one message is pinned, and another unpinned  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-08-11 14:56:59 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								a51b114171 
								
							
								 
							
						 
						
							
							
								
								Change order of test cases  
							
							 
							
							... 
							
							
							
							Just moving test cases so that "generic message" ones are grouped at the bottom.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-08-11 14:51:37 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								ca8832f6fa 
								
							
								 
							
						 
						
							
							
								
								Fix test case  
							
							 
							
							... 
							
							
							
							The test case is:
"mentions message when a single message was pinned, with multiple previously pinned messages"
However, the test case was also unpinning messages. That is now fixed.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-08-11 14:47:50 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								79cf69bedb 
								
							
								 
							
						 
						
							
							
								
								Refactor tests so that snapshots aren't used  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-08-11 11:40:33 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								45fd3d83b0 
								
							
								 
							
						 
						
							
							
								
								Refactor tests  
							
							 
							
							... 
							
							
							
							So that there's one top level `describe('TextForEvent')`, followed by a nested
`describe('textForPinnedEvent')`, containting all the `it()`s.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-08-10 16:06:34 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								e396dcfb10 
								
							
								 
							
						 
						
							
							
								
								Remove @types/streamsaver  
							
							 
							
							
							
						 
						
							2021-08-10 13:22:40 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								ecf0aba97c 
								
							
								 
							
						 
						
							
							
								
								Test for different types of events  
							
							 
							
							
							
						 
						
							2021-08-10 12:25:51 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								900accd823 
								
							
								 
							
						 
						
							
							
								
								Add test for renderToString  
							
							 
							
							
							
						 
						
							2021-08-09 13:25:32 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								850b5452a0 
								
							
								 
							
						 
						
							
							
								
								Add tests for reply regex  
							
							 
							
							
							
						 
						
							2021-08-09 12:36:06 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								45ce352d02 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations  
							
							 
							
							
							
						 
						
							2021-08-09 10:44:13 +05:30  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								881cac0d21 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-04 16:30:03 +02:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								57f5c30af8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6532  from matrix-org/posthog-analytics  
							
							 
							
							... 
							
							
							
							Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies 
							
						 
						
							2021-08-04 09:47:39 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								c9c8177f58 
								
									
								
							
								 
							
						 
						
							
							
								
								Start a call immediately after creating a room via the dial pad ( #6529 )  
							
							 
							
							
							
						 
						
							2021-08-04 09:46:39 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								c74d6c6fff 
								
							
								 
							
						 
						
							
							
								
								Assign replacements  
							
							 
							
							
							
						 
						
							2021-08-04 12:48:32 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								28f5dc483b 
								
							
								 
							
						 
						
							
							
								
								Update eslint plugin & fix silly indenting  
							
							 
							
							... 
							
							
							
							As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15 
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style. 
							
						 
						
							2021-08-03 17:07:37 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								a18f41ceed 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-03 15:43:56 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								2a378f30b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-03 15:38:12 +02:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								dc7aad1abf 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Add support for Posthog Analytics under a labs flag""  
							
							 
							
							... 
							
							
							
							This reverts commit c5ea253181 . 
							
						 
						
							2021-08-03 11:55:02 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								b333612dea 
								
							
								 
							
						 
						
							
							
								
								Fix comparing MB -> bytes  
							
							 
							
							
							
						 
						
							2021-08-03 14:53:23 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								4824c93707 
								
							
								 
							
						 
						
							
							
								
								Add a test file  
							
							 
							
							
							
						 
						
							2021-08-03 14:36:21 +05:30  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								c5ea253181 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Add support for Posthog Analytics under a labs flag"  
							
							 
							
							
							
						 
						
							2021-08-03 07:30:02 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								46e2f67f54 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations  
							
							 
							
							
							
						 
						
							2021-08-03 10:03:16 +05:30  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								a65b41be63 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6495  from matrix-org/posthog-analytics  
							
							 
							
							... 
							
							
							
							Add support for Posthog Analytics under a labs flag 
							
						 
						
							2021-08-02 14:46:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3c436c9617 
								
							
								 
							
						 
						
							
							
								
								update setting naming to match style  
							
							 
							
							
							
						 
						
							2021-07-30 12:20:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9eb0986353 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-30 11:34:52 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								17e9cf4d2a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations  
							
							 
							
							
							
						 
						
							2021-07-30 12:17:31 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								04edf4103f 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary awaits  
							
							 
							
							
							
						 
						
							2021-07-30 11:46:55 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d459dbe700 
								
							
								 
							
						 
						
							
							
								
								Refactor Space Hierarchy stuff in preparation for pagination  
							
							 
							
							
							
						 
						
							2021-07-29 17:35:15 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								02dbdc5c0a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-29 16:11:16 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6f37e8b223 
								
							
								 
							
						 
						
							
							
								
								Use getChildren instead of getSpaceSummary as MSC2946 has moved on  
							
							 
							
							
							
						 
						
							2021-07-29 12:16:59 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6123ccb2eb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096  
							
							 
							
							
							
						 
						
							2021-07-28 17:45:15 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								ecbc536a3e 
								
							
								 
							
						 
						
							
							
								
								Add copyright header  
							
							 
							
							
							
						 
						
							2021-07-28 14:15:27 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
								
								
							
							
								
							
								a09e046c18 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/PosthogAnalytics-test.ts  
							
							 
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-07-28 14:11:55 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								df7ebb2e7c 
								
							
								 
							
						 
						
							
							
								
								Remove commented out block  
							
							 
							
							
							
						 
						
							2021-07-28 14:00:37 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								3ff7de3c96 
								
							
								 
							
						 
						
							
							
								
								Mock SHA-256 to avoid problems loading crypto on Node 14  
							
							 
							
							
							
						 
						
							2021-07-28 13:44:06 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								7cf28de9c9 
								
							
								 
							
						 
						
							
							
								
								take 2 at fixing import  
							
							 
							
							
							
						 
						
							2021-07-28 11:32:17 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								7c62386915 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2021-07-28 11:28:19 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								c697079eb4 
								
							
								 
							
						 
						
							
							
								
								Fix import  
							
							 
							
							
							
						 
						
							2021-07-28 11:22:40 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								bd7e2dee3d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into posthog-analytics  
							
							 
							
							
							
						 
						
							2021-07-28 11:13:22 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								a6df687196 
								
							
								 
							
						 
						
							
							
								
								Tidy up interface and add some comments  
							
							 
							
							
							
						 
						
							2021-07-28 09:54:37 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								1d81bdc6f9 
								
							
								 
							
						 
						
							
							
								
								Interface changes and anonymity fixes  
							
							 
							
							
							
						 
						
							2021-07-28 09:37:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								776435f620 
								
							
								 
							
						 
						
							
							
								
								Switch all-rooms toggle for spaces to non-feature settings key  
							
							 
							
							
							
						 
						
							2021-07-27 21:17:24 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0a9d3302ba 
								
							
								 
							
						 
						
							
							
								
								Fix home vs all rooms requiring app reload and change default to `home`  
							
							 
							
							... 
							
							
							
							Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests 
							
						 
						
							2021-07-27 21:11:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ec173e74e6 
								
							
								 
							
						 
						
							
							
								
								Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload  
							
							 
							
							
							
						 
						
							2021-07-27 20:15:40 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								400e772594 
								
							
								 
							
						 
						
							
							
								
								Fix formatting  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-27 17:53:33 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								3f2dadf0fe 
								
							
								 
							
						 
						
							
							
								
								When a single message is unpinned, link to it  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-27 17:14:50 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								8fe7df9171 
								
							
								 
							
						 
						
							
							
								
								When a single message is pinned, link to it  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-27 17:14:50 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								40ead34c08 
								
							
								 
							
						 
						
							
							
								
								Add test for textForPinnedEvent  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-27 17:14:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								755007cbee 
								
							
								 
							
						 
						
							
							
								
								Conclude labs flags and write more tests  
							
							 
							
							
							
						 
						
							2021-07-27 14:39:14 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								474561600e 
								
							
								 
							
						 
						
							
							
								
								Fix hash == ""  
							
							 
							
							
							
						 
						
							2021-07-27 13:31:56 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c8d9294350 
								
							
								 
							
						 
						
							
							
								
								Discard unused utility now that we use Object.fromEntries  
							
							 
							
							
							
						 
						
							2021-07-23 18:40:22 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								95f4275807 
								
							
								 
							
						 
						
							
							
								
								Add Disabled anonymity, improve tests  
							
							 
							
							
							
						 
						
							2021-07-23 16:47:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								5ccd02dd6e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx 
							
						 
						
							2021-07-23 10:42:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f5630acea7 
								
							
								 
							
						 
						
							
							
								
								Adhere to better eslint rules  
							
							 
							
							
							
						 
						
							2021-07-23 10:35:10 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								6737cfd297 
								
							
								 
							
						 
						
							
							
								
								remove superflous dnt clear  
							
							 
							
							
							
						 
						
							2021-07-21 16:10:06 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								726b4497b2 
								
							
								 
							
						 
						
							
							
								
								Remove redactedCurrentLocation and rely on posthog for DNT  
							
							 
							
							... 
							
							
							
							* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog 
							
						 
						
							2021-07-21 16:06:09 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								4c6b0d35ad 
								
							
								 
							
						 
						
							
							
								
								Improve analytics interface  
							
							 
							
							... 
							
							
							
							* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance 
							
						 
						
							2021-07-21 14:58:43 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								6da3cc8ca1 
								
							
								 
							
						 
						
							
							
								
								Redact sensitive data  
							
							 
							
							
							
						 
						
							2021-07-21 13:48:10 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								390b05617c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx 
							
						 
						
							2021-07-21 10:46:41 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								4b0cb409a0 
								
							
								 
							
						 
						
							
							
								
								Add identifyUser  
							
							 
							
							
							
						 
						
							2021-07-21 08:38:58 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								74b0e52f9a 
								
							
								 
							
						 
						
							
							
								
								Enforce anon/pseudo-anon via types  
							
							 
							
							
							
						 
						
							2021-07-21 08:23:42 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								3135e42586 
								
							
								 
							
						 
						
							
							
								
								Add test for silently ignoring messages when not initialised  
							
							 
							
							
							
						 
						
							2021-07-21 07:42:55 +01:00  
						
					 
				
					
						
							
							
								 
								James Salter
							
						 
						
							 
							
							
							
								
							
								2a48d3c9bc 
								
							
								 
							
						 
						
							
							
								
								First pass at a PosthogAnalytics class  
							
							 
							
							
							
						 
						
							2021-07-21 07:40:39 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								dd6379cf4b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-20 13:15:04 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ce78cdf4ad 
								
							
								 
							
						 
						
							
							
								
								Conform to new react and typescript eslint rules  
							
							 
							
							
							
						 
						
							2021-07-19 22:43:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								de42a00ca4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js 
							
						 
						
							2021-07-19 16:47:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7767bf09c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6393  from robintown/match-avatar-colors  
							
							 
							
							
							
						 
						
							2021-07-17 14:12:29 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								16ed5c6645 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-16 21:43:33 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eefadf6a46 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-07-16 15:30:26 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								831c482371 
								
							
								 
							
						 
						
							
							
								
								Stub out MatrixClient::isUserIgnored for tests  
							
							 
							
							
							
						 
						
							2021-07-15 18:17:07 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								316b21408d 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2021-07-15 10:59:52 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dcb9b9b777 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-07-15 10:04:48 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								c7c29f2119 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6365  from psrpinto/fix/naming  
							
							 
							
							
							
						 
						
							2021-07-15 08:07:03 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								6884b2aa6d 
								
							
								 
							
						 
						
							
							
								
								Standardise spelling of identity server  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-13 16:28:43 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								7a8400e5c7 
								
							
								 
							
						 
						
							
							
								
								Standardise spelling and casing of homeserver  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-13 16:28:43 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0e2bcb474d 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2021-07-12 13:52:10 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ec0f940ef0 
								
							
								 
							
						 
						
							
							
								
								Adjust recording waveform behaviour for voice messages  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/17683  
							
						 
						
							2021-07-12 13:48:01 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f5f4be88f0 
								
							
								 
							
						 
						
							
							
								
								Update tests to expect LinkPreviewGroup behaviour  
							
							 
							
							
							
						 
						
							2021-07-12 08:34:26 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								a90b8f32f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Add some tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-09 16:45:04 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f412fb44a7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts 
							
						 
						
							2021-07-09 08:13:39 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								00a3f5d469 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494  
							
							 
							
							
							
						 
						
							2021-07-08 13:29:10 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c67679b35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-07-08 13:30:57 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4a6af5a4d7 
								
							
								 
							
						 
						
							
							
								
								fix test missing required prop  
							
							 
							
							
							
						 
						
							2021-07-07 18:12:31 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								209cafb1f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6308  from SimonBrandner/burn-sdk-get-comp-with-fire  
							
							 
							
							
							
						 
						
							2021-07-07 16:30:54 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								5fb7dbee3e 
								
							
								 
							
						 
						
							
							
								
								Do not generate a lockfile when running in CI  
							
							 
							
							
							
						 
						
							2021-07-07 16:11:47 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								06284fe73d 
								
							
								 
							
						 
						
							
							
								
								Update e2e tests  
							
							 
							
							
							
						 
						
							2021-07-06 12:05:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								04c923bd75 
								
							
								 
							
						 
						
							
							
								
								fix tests by including client field on the Room stub and stubbing getJoinedMemberCount  
							
							 
							
							
							
						 
						
							2021-07-06 11:35:56 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9d8acd1af0 
								
							
								 
							
						 
						
							
							
								
								stub getJoinRule  
							
							 
							
							
							
						 
						
							2021-07-06 10:44:09 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0ca4a958f7 
								
							
								 
							
						 
						
							
							
								
								fix getCapabilities stub  
							
							 
							
							
							
						 
						
							2021-07-06 10:34:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3301763f12 
								
							
								 
							
						 
						
							
							
								
								stub getCapabilities in tests  
							
							 
							
							
							
						 
						
							2021-07-06 10:19:33 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b36a727a09 
								
									
								
							
								 
							
						 
						
							
							
								
								Fourth batch of burning  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 18:15:05 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b17d72c399 
								
							
								 
							
						 
						
							
							
								
								fix duplicate import  
							
							 
							
							
							
						 
						
							2021-07-02 14:54:10 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b014763cd2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 13:14:14 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								82119a08f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/ts/11  
							
							 
							
							
							
						 
						
							2021-07-02 11:03:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								80f5232217 
								
							
								 
							
						 
						
							
							
								
								Comply with new member-delimiter-style rule  
							
							 
							
							... 
							
							
							
							Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9  in place 
							
						 
						
							2021-07-01 23:23:03 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								88f691776f 
								
							
								 
							
						 
						
							
							
								
								Use sleep from js-sdk as no point duplicating it  
							
							 
							
							
							
						 
						
							2021-07-01 22:55:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								08176beb58 
								
							
								 
							
						 
						
							
							
								
								Kill mock-clock  
							
							 
							
							... 
							
							
							
							We already import sinon's one in UserActivitytest, so use that here too. 
							
						 
						
							2021-07-01 21:52:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								543fe6382d 
								
							
								 
							
						 
						
							
							
								
								Fix linting in tests  
							
							 
							
							... 
							
							
							
							Or in the case of one test, disbale just the one rule it breaks 
							
						 
						
							2021-07-01 20:54:04 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ee9be5438e 
								
							
								 
							
						 
						
							
							
								
								eslint --fix  
							
							 
							
							
							
						 
						
							2021-07-01 20:43:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e768ecb3d0 
								
							
								 
							
						 
						
							
							
								
								Typescript conversion of Composer components and more  
							
							 
							
							
							
						 
						
							2021-06-30 13:01:26 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ae0a8b8da4 
								
							
								 
							
						 
						
							
							
								
								Auto-fix lint errors  
							
							 
							
							
							
						 
						
							2021-06-29 13:11:58 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								71116bfa27 
								
							
								 
							
						 
						
							
							
								
								Migrate to `eslint-plugin-matrix-org`  
							
							 
							
							... 
							
							
							
							This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc. 
							
						 
						
							2021-06-29 12:51:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b60c2c5d55 
								
							
								 
							
						 
						
							
							
								
								Fix e2e test right panel back behaviour  
							
							 
							
							
							
						 
						
							2021-06-29 10:37:30 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								53a6089cc9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6268  from matrix-org/gsouquet/upgrade-puppeteer  
							
							 
							
							
							
						 
						
							2021-06-28 10:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								96857ab7f7 
								
							
								 
							
						 
						
							
							
								
								Fix end-to-end tests rejectToast  
							
							 
							
							
							
						 
						
							2021-06-28 09:01:04 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								2672516b6a 
								
							
								 
							
						 
						
							
							
								
								Upgrade puppeteer to use newer version of Chrome  
							
							 
							
							
							
						 
						
							2021-06-25 14:47:16 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								0df6200dd0 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert MemberList-test to TS  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-23 16:00:13 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c316eb841a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6179  from aaronraimist/open-local-addresses  
							
							 
							
							... 
							
							
							
							Open local addresses section by default when there are no existing local addresses 
							
						 
						
							2021-06-22 14:48:02 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6e3c647109 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							 
							
							... 
							
							
							
							 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock 
							
						 
						
							2021-06-22 21:15:53 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								59052b1eb7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6199  from matrix-org/t3chguy/fix/17665  
							
							 
							
							
							
						 
						
							2021-06-22 17:46:57 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e3e6b74272 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-06-22 17:38:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8a3dc1bbdf 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2021-06-18 17:56:18 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								f96c366aa4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-18 17:07:43 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								35e68b8aa5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665  
							
							 
							
							
							
						 
						
							2021-06-17 15:45:32 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								017e0ba40f 
								
							
								 
							
						 
						
							
							
								
								fix more private field accesses in tests  
							
							 
							
							
							
						 
						
							2021-06-17 15:23:29 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								949532c297 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-06-17 15:53:25 +02:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								48e090abcc 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary comment  
							
							 
							
							
							
						 
						
							2021-06-17 10:20:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e7fde2686f 
								
							
								 
							
						 
						
							
							
								
								remove unused imports  
							
							 
							
							
							
						 
						
							2021-06-16 12:12:00 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								9f8d04ab9a 
								
							
								 
							
						 
						
							
							
								
								Fix passing variable down to evaluate context  
							
							 
							
							
							
						 
						
							2021-06-16 11:39:04 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bceee7978e 
								
							
								 
							
						 
						
							
							
								
								improve naming of tests  
							
							 
							
							
							
						 
						
							2021-06-16 09:30:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9e20e5dfc4 
								
							
								 
							
						 
						
							
							
								
								mock new settings in tests  
							
							 
							
							
							
						 
						
							2021-06-16 09:14:07 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								19cae42161 
								
							
								 
							
						 
						
							
							
								
								Benchmark multiple common user scenario  
							
							 
							
							
							
						 
						
							2021-06-15 15:06:00 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								7310d35d7f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/benchmark-tracking  
							
							 
							
							
							
						 
						
							2021-06-15 11:45:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a63d9220d2 
								
							
								 
							
						 
						
							
							
								
								Clear outstanding TODOs  
							
							 
							
							
							
						 
						
							2021-06-15 08:26:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								66fce64ee0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							 
							
							... 
							
							
							
							 Conflicts:
	package.json
	yarn.lock 
							
						 
						
							2021-06-14 21:39:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								91df392a2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5880  from SimonBrandner/show-username  
							
							 
							
							
							
						 
						
							2021-06-14 21:34:01 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2879b9086c 
								
							
								 
							
						 
						
							
							
								
								Use alphabet from js-sdk  
							
							 
							
							
							
						 
						
							2021-06-14 21:32:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8fd72fcf79 
								
							
								 
							
						 
						
							
							
								
								Iterate algorithm, base it on new js-sdk string lib  
							
							 
							
							
							
						 
						
							2021-06-14 21:28:32 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								7000176572 
								
							
								 
							
						 
						
							
							
								
								Add workflow steps to track measurements  
							
							 
							
							
							
						 
						
							2021-06-14 14:53:22 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4af2675e23 
								
							
								 
							
						 
						
							
							
								
								stash bigint support  
							
							 
							
							
							
						 
						
							2021-06-14 14:37:05 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								b8458c0ae3 
								
									
								
							
								 
							
						 
						
							
							
								
								fix test maybe  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-11 23:58:20 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3d4411390f 
								
							
								 
							
						 
						
							
							
								
								write a shedload more tests  
							
							 
							
							
							
						 
						
							2021-06-11 16:28:07 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								37484e3fc4 
								
							
								 
							
						 
						
							
							
								
								Add TextEncoder polyfill for test run  
							
							 
							
							
							
						 
						
							2021-06-11 12:33:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a4fa2779d4 
								
							
								 
							
						 
						
							
							
								
								Iterate lexicographic ordering implementation  
							
							 
							
							
							
						 
						
							2021-06-11 10:33:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								21fc386317 
								
							
								 
							
						 
						
							
							
								
								Move over to new lexicographic string sorting  
							
							 
							
							
							
						 
						
							2021-06-10 11:40:10 +01: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  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								6e0a908c59 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/react-17  
							
							 
							
							
							
						 
						
							2021-06-09 12:01:35 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d492ee4d8a 
								
							
								 
							
						 
						
							
							
								
								Update Enzyme adapter name  
							
							 
							
							
							
						 
						
							2021-06-09 11:57:29 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								8334a2ba60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6143  from robintown/hide-events-perf  
							
							 
							
							
							
						 
						
							2021-06-09 09:13:56 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								692200b9c5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6145  from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2  
							
							 
							
							... 
							
							
							
							Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests 
							
						 
						
							2021-06-08 14:08:24 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								bf77a4a2ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into show-username  
							
							 
							
							
							
						 
						
							2021-06-08 17:14:42 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								432373a00e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5999  from robintown/improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-08 10:52:06 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								b97867271b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-07 19:09:36 -04:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								9fdbd4c120 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into share-room  
							
							 
							
							
							
						 
						
							2021-06-07 17:00:44 -05:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								773af6c7be 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-07 16:54:53 -05:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								025148d9fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into show-username  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 19:37:22 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								e891d18fa2 
								
							
								 
							
						 
						
							
							
								
								Add my email to my copyright notices  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:41:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								0f64f4d692 
								
							
								 
							
						 
						
							
							
								
								Fix MessagePanel tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 10:49:44 -04:00  
						
					 
				
					
						
							
							
								 
								dependabot[bot]
							
						 
						
							 
							
							
								
								
							
							
								
							
								c24b239478 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests  
							
							 
							
							... 
							
							
							
							Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2021-06-05 13:36:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								31604c13c0 
								
							
								 
							
						 
						
							
							
								
								Lint the typescript tests  
							
							 
							
							... 
							
							
							
							Turns out we hadn't told eslint to lint .ts in tests/
Also fix all the lint errors, including removing a use of assert that
had randomly crept in. 
							
						 
						
							2021-06-04 16:52:50 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								8c533c7f8b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-06-04 08:09:31 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								12e013508d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6132  from matrix-org/travis/ts-mtxcli  
							
							 
							
							... 
							
							
							
							Adapt for js-sdk MatrixClient conversion to TS 
							
						 
						
							2021-06-04 00:07:22 -06: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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								7421efe8f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6136  from matrix-org/dbkr/map_phone_number_lookup_to_native  
							
							 
							
							... 
							
							
							
							Map phone number lookup results to their native rooms 
							
						 
						
							2021-06-03 19:01:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8ef95a6237 
								
							
								 
							
						 
						
							
							
								
								Interface dispatcher payload  
							
							 
							
							... 
							
							
							
							& use constant in test 
							
						 
						
							2021-06-03 14:38:13 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								7f83590846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6079  from matrix-org/gsouquet/switch-rooms  
							
							 
							
							
							
						 
						
							2021-06-03 08:44:01 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1c92e31683 
								
									
								
							
								 
							
						 
						
							
							
								
								Add missing license header  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-02 19:27:57 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0572acb14 
								
									
								
							
								 
							
						 
						
							
							
								
								Write tests for CallEventGrouper  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-02 19:22:22 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2c4fa73a45 
								
							
								 
							
						 
						
							
							
								
								Map phone number lookup results to their native rooms  
							
							 
							
							... 
							
							
							
							When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user. 
							
						 
						
							2021-06-02 17:39:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								da13ec16f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							 
							
							
							
						 
						
							2021-06-02 12:42:55 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d7a5547d80 
								
							
								 
							
						 
						
							
							
								
								use Intl.Collator over String.prototype.localeCompare for better performance  
							
							 
							
							
							
						 
						
							2021-06-02 10:42:17 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								5b2dacd99e 
								
							
								 
							
						 
						
							
							
								
								Adapt for js-sdk MatrixClient conversion to TS  
							
							 
							
							... 
							
							
							
							For https://github.com/matrix-org/matrix-js-sdk/pull/1718  
							
						 
						
							2021-06-01 21:36:28 -06:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								992861a1cd 
								
							
								 
							
						 
						
							
							
								
								Fix forward dialog tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-01 20:36:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								56714525f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-01 17:28:55 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0b7d3f007a 
								
							
								 
							
						 
						
							
							
								
								Remove react-beautiful-dnd  
							
							 
							
							
							
						 
						
							2021-06-01 17:35:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f11a7083ae 
								
							
								 
							
						 
						
							
							
								
								Switch to stable endpoint/fields for MSC2858  
							
							 
							
							
							
						 
						
							2021-06-01 11:01:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								c7c6a818f0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/switch-rooms  
							
							 
							
							
							
						 
						
							2021-05-26 09:51:27 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								121ed5eba9 
								
							
								 
							
						 
						
							
							
								
								Pass Matrix client around as matrixClient  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:51:04 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								400917623c 
								
							
								 
							
						 
						
							
							
								
								Make myself the copyright holder for forward dialog code  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:33:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								7a04502151 
								
							
								 
							
						 
						
							
							
								
								Iterate on forward dialog design feedback  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-21 12:41:29 -04:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								c428736191 
								
							
								 
							
						 
						
							
							
								
								Update MessagePanel test to account for new DOM structure  
							
							 
							
							
							
						 
						
							2021-05-21 14:59:26 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								678b298bab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-19 12:39:48 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								aa4984019c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6061  from jaiwanth-v/update-memberlist-invite  
							
							 
							
							... 
							
							
							
							Update MemberList to reflect changes for invite permission change 
							
						 
						
							2021-05-19 17:35:58 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								a9d0699488 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6062  from matrix-org/t3chguy/fix/17280  
							
							 
							
							... 
							
							
							
							Show DMs in space for invited members too, to match Android impl 
							
						 
						
							2021-05-19 12:41:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								88d3706c04 
								
							
								 
							
						 
						
							
							
								
								mock getMembers on mkStubRoom  
							
							 
							
							
							
						 
						
							2021-05-19 12:34:27 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								506a798961 
								
							
								 
							
						 
						
							
							
								
								Add getMember mock  
							
							 
							
							
							
						 
						
							2021-05-19 15:19:56 +05:30  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7d0afcd28 
								
									
								
							
								 
							
						 
						
							
							
								
								Performance monitoring measurements ( #6041 )  
							
							 
							
							
							
						 
						
							2021-05-19 10:07:02 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								454df8947b 
								
							
								 
							
						 
						
							
							
								
								Add mock for new client method  
							
							 
							
							
							
						 
						
							2021-05-18 13:46:47 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								e798b36f1d 
								
							
								 
							
						 
						
							
							
								
								Decorate forward dialog room avatars  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-16 08:39:22 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								64e828d069 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-16 08:13:59 -04:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								df7b598ca7 
								
							
								 
							
						 
						
							
							
								
								Improve visible waveform for voice messages  
							
							 
							
							... 
							
							
							
							This tries to prioritize actual voice to decide the waveform, and clamps noise to zero to ensure the waveform doesn't have a perceptually noisy base.
In theory this better matches the overall voice message content. 
							
						 
						
							2021-05-13 22:20:08 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								d8e3458c55 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2  
							
							 
							
							
							
						 
						
							2021-05-11 10:15:37 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								beef07bdef 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into err  
							
							 
							
							
							
						 
						
							2021-05-10 20:08:19 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								379d19e2e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							2021-05-10 19:56:30 -06:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								c39d9649ba 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-10 13:38:02 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								503301aa89 
								
							
								 
							
						 
						
							
							
								
								Make rooms in ForwardDialog clickable  
							
							 
							
							... 
							
							
							
							…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 13:00:06 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								5c10e1e574 
								
							
								 
							
						 
						
							
							
								
								Fix lints  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:16:37 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eb779cd3d8 
								
							
								 
							
						 
						
							
							
								
								Test that forward buttons are disabled for rooms without permission  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:10:41 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								35cf0e1c7e 
								
							
								 
							
						 
						
							
							
								
								Find components by name rather than class in ForwardDialog test  
							
							 
							
							... 
							
							
							
							It makes things shorter and more readable!
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:10:39 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eb07f1fb86 
								
							
								 
							
						 
						
							
							
								
								Test that ForwardDialog can render replies  
							
							 
							
							... 
							
							
							
							Previously ForwardDialog was not giving its EventTile message preview
the information it needed to render a ReplyThread. This was a bit tricky
to fix since we were pulling a fake event out of thin air, so this
ensures it doesn't regress.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 00:54:00 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								74925b2c6d 
								
							
								 
							
						 
						
							
							
								
								Test ForwardDialog  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-08 21:11:06 -04:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								2ad0032f72 
								
							
								 
							
						 
						
							
							
								
								Added regression tests for Natural headers  
							
							 
							
							
							
						 
						
							2021-05-09 01:10:54 +05:30  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								b007ea81b2 
								
							
								 
							
						 
						
							
							
								
								Rescale and smooth playback waveform to better match expectation  
							
							 
							
							
							
						 
						
							2021-05-07 21:06:07 -06:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								32edbc155f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into err  
							
							 
							
							
							
						 
						
							2021-05-07 19:16:00 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								90fa738734 
								
							
								 
							
						 
						
							
							
								
								Fix that one final pesky test  
							
							 
							
							
							
						 
						
							2021-05-07 11:22:10 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f0e61e6286 
								
							
								 
							
						 
						
							
							
								
								short circuit automatic switch to related space behaviour and fix tests  
							
							 
							
							
							
						 
						
							2021-05-07 11:08:18 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9d9dce7a91 
								
							
								 
							
						 
						
							
							
								
								update orphan room behaviour test to expect new home space behaviour  
							
							 
							
							
							
						 
						
							2021-05-07 10:48:55 +01:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								d1f23fb994 
								
							
								 
							
						 
						
							
							
								
								Partially added the tests  [WIP]  
							
							 
							
							
							
						 
						
							2021-05-07 11:45:52 +05:30  
						
					 
				
					
						
							
							
								 
								dependabot[bot]
							
						 
						
							 
							
							
								
								
							
							
								
							
								137189932e 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests  
							
							 
							
							... 
							
							
							
							Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2021-05-07 01:13:47 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								683aec1066 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5833  from SimonBrandner/feed  
							
							 
							
							... 
							
							
							
							Support for multiple streams (not MSC3077) 
							
						 
						
							2021-05-06 11:20:09 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								ed8b05b730 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5951  from SimonBrandner/fix/room-pill-history  
							
							 
							
							... 
							
							
							
							Fix saving room pill part to history 
							
						 
						
							2021-05-04 12:32:04 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1fe2085309 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix deserialize test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-05-01 12:28:18 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								5913203dc6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into fix-indent  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-29 20:08:14 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								232b87a3b4 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve formatting  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-29 19:57:02 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								8d8525cdeb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5935  from matrix-org/travis/voice/control-bar  
							
							 
							
							... 
							
							
							
							Voice messages: Composer controls 
							
						 
						
							2021-04-28 09:38:28 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								9aaf321e4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove dis call which doesn't seem to be necessary  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 13:39:09 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b6324a816f 
								
									
								
							
								 
							
						 
						
							
							
								
								Use CallHandler correctly  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 13:33:15 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								40748d3c94 
								
									
								
							
								 
							
						 
						
							
							
								
								Make CallHandler emit CallChangeRoom  
							
							 
							
							... 
							
							
							
							Let's hope I changed the tests correctly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 11:49:07 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								c95c1aeffd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5886  from matrix-org/dbkr/asserted_identity  
							
							 
							
							... 
							
							
							
							Support MSC3086 asserted identity 
							
						 
						
							2021-04-28 09:47:40 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								32e3ce3dea 
								
							
								 
							
						 
						
							
							
								
								Handle basic state machine of recordings  
							
							 
							
							
							
						 
						
							2021-04-27 15:02:15 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								be7d4d020b 
								
							
								 
							
						 
						
							
							
								
								Put asserted identity option under a 'voip' section  
							
							 
							
							
							
						 
						
							2021-04-27 19:33:53 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								705505fe85 
								
							
								 
							
						 
						
							
							
								
								make copyright not lie  
							
							 
							
							
							
						 
						
							2021-04-27 18:56:36 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								46bfbbadf9 
								
									
								
							
								 
							
						 
						
							
							
								
								Enable indent rule and fix indent  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-27 17:23:27 +02:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								dd8abb0206 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5912  from matrix-org/jryans/convert-flow-to-ts  
							
							 
							
							... 
							
							
							
							Convert some Flow-typed files to TypeScript 
							
						 
						
							2021-04-27 13:44:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								f18a24025a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix/17022  
							
							 
							
							
							
						 
						
							2021-04-27 11:16:02 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								cddcedcce2 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts  
							
							 
							
							
							
						 
						
							2021-04-26 15:57:28 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ba4e58513d 
								
							
								 
							
						 
						
							
							
								
								Fix ScalarAuthClient test  
							
							 
							
							
							
						 
						
							2021-04-26 15:41:19 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								203425c8de 
								
							
								 
							
						 
						
							
							
								
								Test and fix space store wrongly treating room invites as space invites  
							
							 
							
							
							
						 
						
							2021-04-26 08:37:45 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								47c12a7d23 
								
							
								 
							
						 
						
							
							
								
								Add tests for rooms moving around the SpaceStore  
							
							 
							
							
							
						 
						
							2021-04-25 09:24:00 +01:00