Bruno Windels
							
						 
						
							 
							
							
							
								
							
								5eaf03c3da 
								
							
								 
							
						 
						
							
							
								
								update e2e tests to expand local aliases when adding one  
							
							 
							
							
							
						 
						
							2020-03-09 17:03:50 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								866ed68615 
								
							
								 
							
						 
						
							
							
								
								Ensure DMs tagged outside of account data work in the invite dialog  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/12418 
Includes a refactor so we don't need to litter the code with the same magic string for DM tags. 
							
						 
						
							2020-02-24 19:43:49 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								72e5313a5a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4113  from matrix-org/t3chguy/fix_downloading  
							
							 
							
							... 
							
							
							
							Handle file downloading locally in electron rather than sending to browser 
							
						 
						
							2020-02-24 13:37:16 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								13b08b5fcc 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Fix escaped markdown passing backslashes through"  
							
							 
							
							
							
						 
						
							2020-02-24 11:27:22 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d783ce86c8 
								
							
								 
							
						 
						
							
							
								
								Use noreferrer in addition to noopener for edge case browsers  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-02-23 22:14:29 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								164b355ffe 
								
							
								 
							
						 
						
							
							
								
								abstract out the check for available target devices  
							
							 
							
							
							
						 
						
							2020-02-18 11:25:19 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								23596031db 
								
							
								 
							
						 
						
							
							
								
								rip foldleft, died of lint issues  
							
							 
							
							
							
						 
						
							2020-02-17 16:00:25 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								28df1e28cf 
								
							
								 
							
						 
						
							
							
								
								Start verification sessions in an E2E DM where possible  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/12187  
							
						 
						
							2020-02-17 15:08:22 +00:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
								
								
							
							
								
							
								4a204b715d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4059  from matrix-org/uhoreg/refactor_event_grouping  
							
							 
							
							... 
							
							
							
							refactor event grouping into separate helper classes 
							
						 
						
							2020-02-14 10:35:34 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								43f15ab47d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4008  from BobVul/fix-markdown-escapes  
							
							 
							
							... 
							
							
							
							Fix escaped markdown passing backslashes through 
							
						 
						
							2020-02-14 09:18:53 +00:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								908ca6b6ef 
								
							
								 
							
						 
						
							
							
								
								add test for grouping room creation events  
							
							 
							
							
							
						 
						
							2020-02-13 17:25:54 -05:00  
						
					 
				
					
						
							
							
								 
								Marco Zehe
							
						 
						
							 
							
							
							
								
							
								8004a35179 
								
							
								 
							
						 
						
							
							
								
								Update to use proper quotes and fix code styling. And fix test.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Marco Zehe <marcozehe@mailbox.org> 
							
						 
						
							2020-02-12 10:54:08 +01:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								9a5663056d 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2020-02-11 12:06:40 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								6b6d612041 
								
							
								 
							
						 
						
							
							
								
								Fix error message rendering for key entry  
							
							 
							
							... 
							
							
							
							Relates to https://github.com/vector-im/riot-web/issues/12288  
							
						 
						
							2020-02-11 12:02:12 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								544479a6ee 
								
							
								 
							
						 
						
							
							
								
								test code cleaned up slightly  
							
							 
							
							
							
						 
						
							2020-02-04 11:31:16 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								150fe7a45a 
								
							
								 
							
						 
						
							
							
								
								Tests for MKeyVerificationConclusion  
							
							 
							
							
							
						 
						
							2020-02-04 11:25:19 +00:00  
						
					 
				
					
						
							
							
								 
								BobVul
							
						 
						
							 
							
							
							
								
							
								1df6837649 
								
							
								 
							
						 
						
							
							
								
								Missing semicolon  
							
							 
							
							
							
						 
						
							2020-02-04 10:38:43 +11:00  
						
					 
				
					
						
							
							
								 
								BobVul
							
						 
						
							 
							
							
							
								
							
								fde30577e4 
								
							
								 
							
						 
						
							
							
								
								Fix escaped markdown passing backslashes through  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11230 
Signed-off-by: Bob Rao <bob+git@vulpin.com> 
							
						 
						
							2020-01-31 12:33:57 +11:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								5c4b91457e 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2020-01-30 22:28:56 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								9722b34c35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3906  from matrix-org/travis/user-lists-labs  
							
							 
							
							... 
							
							
							
							Remove user lists feature flag, making it the default 
							
						 
						
							2020-01-24 08:57:27 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								d7a4698db8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3891  from matrix-org/t3chguy/fix_multi_paragraph_formatting  
							
							 
							
							... 
							
							
							
							Fix paragraph-awareness of the composer formatting features 
							
						 
						
							2020-01-23 13:31:12 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								65450e893c 
								
							
								 
							
						 
						
							
							
								
								Try and fix e2e tests for new invite dialog  
							
							 
							
							
							
						 
						
							2020-01-22 22:40:02 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								97edb824bc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3893  from matrix-org/t3chguy/double_slash  
							
							 
							
							... 
							
							
							
							Slash Command improvements around sending messages with leading slash 
							
						 
						
							2020-01-22 14:32:09 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								832da062cc 
								
							
								 
							
						 
						
							
							
								
								Improve trailing spurious breaks + tests  
							
							 
							
							
							
						 
						
							2020-01-22 13:37:27 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e1e53f567f 
								
							
								 
							
						 
						
							
							
								
								add more tests  
							
							 
							
							
							
						 
						
							2020-01-22 11:56:27 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fc724cfe70 
								
							
								 
							
						 
						
							
							
								
								fix tests some moar  
							
							 
							
							
							
						 
						
							2020-01-22 11:05:25 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								176605c302 
								
							
								 
							
						 
						
							
							
								
								update tests to match new rendering method  
							
							 
							
							
							
						 
						
							2020-01-22 10:49:58 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9a530a72f6 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2020-01-21 15:36:25 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b2aba6db35 
								
							
								 
							
						 
						
							
							
								
								Initial attempt to make toggleInlineFormat paragraph-aware  
							
							 
							
							
							
						 
						
							2020-01-21 15:32:32 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								397e116efb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/roving  
							
							 
							
							
							
						 
						
							2020-01-20 20:48:11 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9365a9cb30 
								
							
								 
							
						 
						
							
							
								
								Remove lolex where its not needed and move to dev-deps. Remove unused optimist  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-18 01:39:14 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8ba54f5f7d 
								
							
								 
							
						 
						
							
							
								
								Don't use expect and jest-mock anymore as they're implicit from jest  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-18 01:38:22 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4504d9b790 
								
							
								 
							
						 
						
							
							
								
								add tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-16 03:15:52 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								1e70af00a3 
								
							
								 
							
						 
						
							
							
								
								Fix GroupView test  
							
							 
							
							... 
							
							
							
							It was counting the wrong number of updates for reasons I don't understand. 
							
						 
						
							2020-01-13 20:15:58 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								bf6798e109 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							 
							
							
							
						 
						
							2020-01-13 13:28:33 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								e66f2a6c3f 
								
							
								 
							
						 
						
							
							
								
								Revert ES6ification of end-to-end tests and add instructions for Windows  
							
							 
							
							... 
							
							
							
							Because the tests are run directly by node, we have to use the CommonJS module syntax. We could run the thing through babel, but then we just have another babel.
Windows instructions are from experience and may not be optimized. 
							
						 
						
							2020-01-10 10:13:41 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								aa38946166 
								
							
								 
							
						 
						
							
							
								
								Actually define some tests in TextualBody's test  
							
							 
							
							... 
							
							
							
							Jest really wants you to do things the right way. 
							
						 
						
							2020-01-09 17:24:13 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								4bc5ada50e 
								
							
								 
							
						 
						
							
							
								
								Fix test bootstrap for new skinning approach  
							
							 
							
							
							
						 
						
							2020-01-09 17:23:46 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								54f3288dea 
								
							
								 
							
						 
						
							
							
								
								Fix imports for tests  
							
							 
							
							... 
							
							
							
							This doesn't fix the fact that someone called it "peg". 
							
						 
						
							2020-01-09 17:23:27 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								a8c8406ac4 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps  
							
							 
							
							
							
						 
						
							2020-01-09 16:06:46 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								dc914774fb 
								
							
								 
							
						 
						
							
							
								
								Delete files that were conflicting in the merge and deleted on develop  
							
							 
							
							
							
						 
						
							2020-01-09 14:19:19 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								fde32f13a5 
								
							
								 
							
						 
						
							
							
								
								[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop  
							
							 
							
							
							
						 
						
							2020-01-09 14:15:09 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								245a68b3ba 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody  
							
							 
							
							... 
							
							
							
							 Conflicts:
	yarn.lock 
							
						 
						
							2020-01-09 12:17:21 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								59f608ffd6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3761  from matrix-org/travis/babel7-wp-es6-export  
							
							 
							
							... 
							
							
							
							Convert CommonJS exports to ES6 exports 
							
						 
						
							2020-01-08 09:09:11 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7b91d2056b 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix e2e tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 23:50:42 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bdef54622b 
								
							
								 
							
						 
						
							
							
								
								delint and add copyright  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 14:52:08 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f1de6d060a 
								
							
								 
							
						 
						
							
							
								
								Add a regression test for editing events and url previews  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 14:38:21 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c551f2983a 
								
							
								 
							
						 
						
							
							
								
								Add TextualBody-test.js  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 13:28:29 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c802f9a302 
								
							
								 
							
						 
						
							
							
								
								remove unused stale Test Suite  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 00:23:19 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d31c863563 
								
							
								 
							
						 
						
							
							
								
								Remove all usages of slate in favour of CIDER  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 00:15:48 +00:00