f45510ed25 
								
							
								 
							
						 
						
							
							
								
								Fix test assuming too much about the underlying calls  
							
							
							
						 
						
							2021-02-19 13:08:30 +00:00  
				
					
						
							
							
								 
						
							
							
								3c52446205 
								
							
								 
							
						 
						
							
							
								
								Remove redundant PhasedRollOut  
							
							
							
						 
						
							2021-02-19 00:01:07 +00:00  
				
					
						
							
							
								 
						
							
							
								196507a730 
								
							
								 
							
						 
						
							
							
								
								VoIP virtual rooms, mk II  
							
							... 
							
							
							
							Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo. 
							
						 
						
							2021-02-12 20:55:54 +00:00  
				
					
						
							
							
								 
						
							
							
								474c029db5 
								
							
								 
							
						 
						
							
							
								
								Fix permalink via parsing for rooms  
							
							... 
							
							
							
							This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345  
							
						 
						
							2021-02-03 15:18:19 +00:00  
				
					
						
							
							
								 
						
							
							
								5a49cbf51a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5600  from weeman1337/fix-e2et-run-out  
							
							... 
							
							
							
							Fix app-url hint in the e2e-test run script output 
							
						 
						
							2021-02-01 12:47:12 +00:00  
				
					
						
							
							
								 
						
							
							
								89b835dd20 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5575  from matrix-org/jryans/no-event-pills  
							
							... 
							
							
							
							Remove pills from event permalinks with text 
							
						 
						
							2021-02-01 10:53:22 +00:00  
				
					
						
							
							
								 
						
							
							
								0660371461 
								
									
								
							
								 
							
						 
						
							
							
								
								fix typo in end-to-end-test run script output  
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-01-31 09:53:15 +01:00  
				
					
						
							
							
								 
						
							
							
								0cb266eda2 
								
							
								 
							
						 
						
							
							
								
								lolex renamed to @sinonjs/fake-timers  
							
							
							
						 
						
							2021-01-27 12:31:37 +00:00  
				
					
						
							
							
								 
						
							
							
								fa3ace8473 
								
							
								 
							
						 
						
							
							
								
								Rework message pilling to ignore event permalinks  
							
							... 
							
							
							
							This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188 
Fixes https://github.com/vector-im/element-web/issues/15159  
							
						 
						
							2021-01-27 11:46:20 +00:00  
				
					
						
							
							
								 
						
							
							
								f703383ab6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5560  from matrix-org/dbkr/voip_user_mapper  
							
							... 
							
							
							
							Add VoIP user mapper 
							
						 
						
							2021-01-22 14:12:08 +00:00  
				
					
						
							
							
								 
						
							
							
								ba45b47240 
								
							
								 
							
						 
						
							
							
								
								Oops, the tests won't work if we don't export the functions  
							
							
							
						 
						
							2021-01-21 22:42:12 +00:00  
				
					
						
							
							
								 
						
							
							
								0a90c982c7 
								
							
								 
							
						 
						
							
							
								
								Add VoIP user mapper  
							
							... 
							
							
							
							The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call. 
							
						 
						
							2021-01-21 19:20:35 +00:00  
				
					
						
							
							
								 
						
							
							
								e49a931588 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5533  from aaronraimist/security-key  
							
							... 
							
							
							
							Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase 
							
						 
						
							2021-01-21 17:46:02 +00:00  
				
					
						
							
							
								 
						
							
							
								97a551c04a 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2021-01-14 17:39:58 +00:00  
				
					
						
							
							
								 
						
							
							
								6371a4abd1 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							Remove stray file extensions in includes and update shared instance
name. 
							
						 
						
							2021-01-13 16:02:35 +00:00  
				
					
						
							
							
								 
						
							
							
								4f96d5dee5 
								
									
								
							
								 
							
						 
						
							
							
								
								Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-01-04 19:17:17 -06:00  
				
					
						
							
							
								 
						
							
							
								2142a65a9b 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2020-12-16 10:46:39 +00:00  
				
					
						
							
							
								 
						
							
							
								4c2b6f410b 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							2020-12-16 10:41:56 +00:00  
				
					
						
							
							
								 
						
							
							
								70f24baaf1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5425  from macekj/emoji_quick_shortcut  
							
							... 
							
							
							
							Add keyboard shortcut for emoji reactions 
							
						 
						
							2020-12-14 13:12:49 +00:00  
				
					
						
							
							
								 
						
							
							
								b365d3b27e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into new/room-alias-in-permalink  
							
							
							
						 
						
							2020-12-07 10:30:50 +13:00  
				
					
						
							
							
								 
						
							
							
								0c85cb587d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into emoji_quick_shortcut  
							
							
							
						 
						
							2020-12-04 11:05:50 -05:00  
				
					
						
							
							
								 
						
							
							
								1fda735222 
								
							
								 
							
						 
						
							
							
								
								Rebrand various CI scripts and modules  
							
							... 
							
							
							
							This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).
Fixes https://github.com/vector-im/element-web/issues/14894  
							
						 
						
							2020-12-03 13:56:27 +00:00  
				
					
						
							
							
								 
						
							
							
								6670c727a4 
								
							
								 
							
						 
						
							
							
								
								Add getCanonicalAlias to mock  
							
							
							
						 
						
							2020-12-02 13:28:35 +13:00  
				
					
						
							
							
								 
						
							
							
								eb25c39318 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials  
							
							... 
							
							
							
							 Conflicts:
	src/i18n/strings/en_EN.json 
							
						 
						
							2020-12-01 16:33:29 +00:00  
				
					
						
							
							
								 
						
							
							
								3bdedd73f7 
								
							
								 
							
						 
						
							
							
								
								fix another test  
							
							
							
						 
						
							2020-11-25 11:38:43 +00:00  
				
					
						
							
							
								 
						
							
							
								c4084196d1 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2020-11-25 10:39:44 +00:00  
				
					
						
							
							
								 
						
							
							
								1b1c482f9c 
								
							
								 
							
						 
						
							
							
								
								Iterate tests  
							
							
							
						 
						
							2020-11-25 10:22:16 +00:00  
				
					
						
							
							
								 
						
							
							
								ba8d02a808 
								
							
								 
							
						 
						
							
							
								
								add quick shortcut emoji feature and tests  
							
							... 
							
							
							
							Signed-off-by: macekj <macekj@umich.edu> 
							
						 
						
							2020-11-17 17:36:58 -05:00  
				
					
						
							
							
								 
						
							
							
								5f3af7863a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into katex  
							
							
							
						 
						
							2020-11-10 18:19:20 +00:00  
				
					
						
							
							
								 
						
							
							
								4997676f5d 
								
							
								 
							
						 
						
							
							
								
								fix last remaining broken test  
							
							
							
						 
						
							2020-11-05 16:57:51 +00:00  
				
					
						
							
							
								 
						
							
							
								ae2d9941ff 
								
							
								 
							
						 
						
							
							
								
								fix more tests  
							
							
							
						 
						
							2020-11-05 16:54:25 +00:00  
				
					
						
							
							
								 
						
							
							
								54e41b5f32 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							2020-11-05 16:27:41 +00:00  
				
					
						
							
							
								 
						
							
							
								6029f2a03b 
								
							
								 
							
						 
						
							
							
								
								update e2e tests for invite ux tweaks  
							
							
							
						 
						
							2020-11-03 15:16:52 +00:00  
				
					
						
							
							
								 
						
							
							
								db0d74d0d4 
								
							
								 
							
						 
						
							
							
								
								Remove a couple more files from eslintignore  
							
							... 
							
							
							
							Just var/const & spaces 
							
						 
						
							2020-10-30 18:33:33 +00:00  
				
					
						
							
							
								 
						
							
							
								3f9f1d03c8 
								
							
								 
							
						 
						
							
							
								
								stubbed isGuest for unit tests  
							
							
							
						 
						
							2020-10-29 13:22:09 +00:00  
				
					
						
							
							
								 
						
							
							
								b7a1e698df 
								
							
								 
							
						 
						
							
							
								
								fix tests which use a private method  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-14 10:47:46 +01:00  
				
					
						
							
							
								 
						
							
							
								b2d04deb83 
								
							
								 
							
						 
						
							
							
								
								fix tests for the new sessionStorage key  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-08 10:04:01 +01:00  
				
					
						
							
							
								 
						
							
							
								a8d88e01fb 
								
							
								 
							
						 
						
							
							
								
								Write Enzyme tests for SendMessageComposer state/history persistence behaviour  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-07 00:10:40 +01:00  
				
					
						
							
							
								 
						
							
							
								965debf442 
								
							
								 
							
						 
						
							
							
								
								extend mockClient in testutils  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-07 00:09:48 +01:00  
				
					
						
							
							
								 
						
							
							
								ffa7ceb70e 
								
							
								 
							
						 
						
							
							
								
								Trim range when formatting so that it excludes leading/trailing spaces  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-09-29 14:15:20 +01:00  
				
					
						
							
							
								 
						
							
							
								fe67ebf1fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5209  from matrix-org/t3chguy/fix/12591  
							
							... 
							
							
							
							Retry loading i18n language if it fails 
							
						 
						
							2020-09-24 17:03:25 +01:00  
				
					
						
							
							
								 
						
							
							
								b5000b236f 
								
							
								 
							
						 
						
							
							
								
								Fix lint error  
							
							
							
						 
						
							2020-09-16 17:12:51 +01:00  
				
					
						
							
							
								 
						
							
							
								a18d0271c3 
								
							
								 
							
						 
						
							
							
								
								Adjust tests for Secure Backup toast  
							
							
							
						 
						
							2020-09-16 16:51:10 +01:00  
				
					
						
							
							
								 
						
							
							
								46f37fb969 
								
							
								 
							
						 
						
							
							
								
								Create cross-signing keys during authentication  
							
							... 
							
							
							
							With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before. 
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								7bd5e3fa31 
								
							
								 
							
						 
						
							
							
								
								Move security-related dialogs to a common directory  
							
							
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								608249745a 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests some more  
							
							
							
						 
						
							2020-09-15 13:19:47 +01:00  
				
					
						
							
							
								 
						
							
							
								39a59dbefa 
								
							
								 
							
						 
						
							
							
								
								fix CI some more  
							
							
							
						 
						
							2020-09-09 12:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								d9e17e89b5 
								
							
								 
							
						 
						
							
							
								
								fix CI  
							
							
							
						 
						
							2020-09-09 12:55:16 +01:00  
				
					
						
							
							
								 
						
							
							
								b635598bc3 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests and fix RoomSummaryCard having wrong member count  
							
							
							
						 
						
							2020-09-09 12:28:12 +01:00  
				
					
						
							
							
								 
						
							
							
								8dcb2d4719 
								
							
								 
							
						 
						
							
							
								
								attempt to fix CI tests  
							
							
							
						 
						
							2020-09-09 12:06:16 +01:00