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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0c85cb587d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into emoji_quick_shortcut  
							
							
							
						 
						
							2020-12-04 11:05:50 -05: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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3f9f1d03c8 
								
							
								 
							
						 
						
							
							
								
								stubbed isGuest for unit tests  
							
							
							
						 
						
							2020-10-29 13:22:09 +00: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  
				
					
						
							
							
								 
						
							
							
								7bd5e3fa31 
								
							
								 
							
						 
						
							
							
								
								Move security-related dialogs to a common directory  
							
							
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								c120458b81 
								
							
								 
							
						 
						
							
							
								
								fix test stub  
							
							
							
						 
						
							2020-08-29 13:02:45 +01:00  
				
					
						
							
							
								 
						
							
							
								72498df28f 
								
							
								 
							
						 
						
							
							
								
								Remove create-react-class  
							
							
							
						 
						
							2020-08-29 12:14:16 +01:00  
				
					
						
							
							
								 
						
							
							
								ce226ab534 
								
							
								 
							
						 
						
							
							
								
								Replace Riot with Element in docs and comments  
							
							... 
							
							
							
							This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864  
							
						 
						
							2020-08-03 18:33:36 +01:00  
				
					
						
							
							
								 
						
							
							
								38e93469d3 
								
							
								 
							
						 
						
							
							
								
								Fix broken test  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-23 09:01:44 +01:00  
				
					
						
							
							
								 
						
							
							
								2dfd636a9e 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2020-07-17 16:28:49 -06:00  
				
					
						
							
							
								 
						
							
							
								c9b0b3b31d 
								
							
								 
							
						 
						
							
							
								
								RoomSublist2 -> RoomSublist  
							
							
							
						 
						
							2020-07-17 15:46:46 -06:00  
				
					
						
							
							
								 
						
							
							
								96065ae982 
								
							
								 
							
						 
						
							
							
								
								RoomTile2 -> RoomTile  
							
							
							
						 
						
							2020-07-17 15:43:29 -06:00  
				
					
						
							
							
								 
						
							
							
								a7c18bfbfa 
								
							
								 
							
						 
						
							
							
								
								RoomList2 -> RoomList  
							
							
							
						 
						
							2020-07-17 15:27:49 -06:00  
				
					
						
							
							
								 
						
							
							
								2b15ba21dd 
								
							
								 
							
						 
						
							
							
								
								Rename RoomListStore file  
							
							
							
						 
						
							2020-07-17 15:11:34 -06:00  
				
					
						
							
							
								 
						
							
							
								209a5d2220 
								
							
								 
							
						 
						
							
							
								
								Rename RoomListStore2 class name  
							
							... 
							
							
							
							We use `RoomListStore` as a singleton, and don't want the ugly `2` at the end of the actual store instance, so here we rename it to something half-decent. 
							
						 
						
							2020-07-17 15:10:30 -06:00  
				
					
						
							
							
								 
						
							
							
								3826d81358 
								
							
								 
							
						 
						
							
							
								
								Enable test mode  
							
							
							
						 
						
							2020-07-10 11:05:56 -06:00  
				
					
						
							
							
								 
						
							
							
								bba8197592 
								
							
								 
							
						 
						
							
							
								
								Use the new layout store  
							
							
							
						 
						
							2020-07-09 22:40:34 -06:00  
				
					
						
							
							
								 
						
							
							
								75dbd5f1d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/enable  
							
							
							
						 
						
							2020-07-09 22:28:16 -06:00  
				
					
						
							
							
								 
						
							
							
								121e41d20b 
								
							
								 
							
						 
						
							
							
								
								Remove irrelevant function  
							
							
							
						 
						
							2020-07-07 16:20:53 -06:00  
				
					
						
							
							
								 
						
							
							
								5ace405062 
								
							
								 
							
						 
						
							
							
								
								The linter will never be appeased  
							
							
							
						 
						
							2020-07-07 16:01:42 -06:00  
				
					
						
							
							
								 
						
							
							
								85af3ebcc0 
								
							
								 
							
						 
						
							
							
								
								Lie about DMs in tests  
							
							
							
						 
						
							2020-07-07 15:58:15 -06:00  
				
					
						
							
							
								 
						
							
							
								044c223899 
								
							
								 
							
						 
						
							
							
								
								Remove debug  
							
							
							
						 
						
							2020-07-07 15:53:12 -06:00  
				
					
						
							
							
								 
						
							
							
								767db73853 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2020-07-07 15:50:04 -06:00  
				
					
						
							
							
								 
						
							
							
								f89fcd1fe9 
								
							
								 
							
						 
						
							
							
								
								Fix tests and add general safety  
							
							... 
							
							
							
							We don't need the fake clock anymore, but we do have to wait for async actions to complete before moving forward.
This also exposes a number of functions for the store to be puppetted with. 
							
						 
						
							2020-07-07 15:45:59 -06:00  
				
					
						
							
							
								 
						
							
							
								c774b88bda 
								
							
								 
							
						 
						
							
							
								
								Initial pass of fixing tests  
							
							... 
							
							
							
							* Use new components
* Use new tagId prop on sublists
* Define onResize for the room list so it doesn't crash 
							
						 
						
							2020-07-07 15:06:06 -06:00  
				
					
						
							
							
								 
						
							
							
								99734dcfe8 
								
							
								 
							
						 
						
							
							
								
								please work  
							
							
							
						 
						
							2020-07-07 17:11:14 +01:00  
				
					
						
							
							
								 
						
							
							
								af2b826136 
								
							
								 
							
						 
						
							
							
								
								Please fix test  
							
							
							
						 
						
							2020-07-07 16:57:56 +01:00  
				
					
						
							
							
								 
						
							
							
								2969820371 
								
							
								 
							
						 
						
							
							
								
								LINT  
							
							
							
						 
						
							2020-06-26 20:31:22 +01:00  
				
					
						
							
							
								 
						
							
							
								0579c9f748 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2020-06-26 20:25:38 +01:00  
				
					
						
							
							
								 
						
							
							
								73d966443c 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-24 14:25:31 +01:00  
				
					
						
							
							
								 
						
							
							
								880e16aaa2 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js 
							
						 
						
							2020-05-23 11:12:58 +01:00  
				
					
						
							
							
								 
						
							
							
								7ff850deea 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4253  from matrix-org/travis/room-list-2  
							
							... 
							
							
							
							Rewrite the room list store 
							
						 
						
							2020-05-21 13:30:32 -06:00  
				
					
						
							
							
								 
						
							
							
								adec5a4f92 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							
							
						 
						
							2020-05-20 15:09:10 +01:00  
				
					
						
							
							
								 
						
							
							
								e79959a4ec 
								
							
								 
							
						 
						
							
							
								
								try fix tests  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-15 00:31:30 +01:00