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  
				
					
						
							
							
								 
						
							
							
								c578026474 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/fix/13641' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/13641  
							
							... 
							
							
							
							 Conflicts:
	src/editor/parts.ts 
							
						 
						
							2020-07-24 08:18:20 +01:00  
				
					
						
							
							
								 
						
							
							
								93b0287e11 
								
							
								 
							
						 
						
							
							
								
								s/semi-colon/colon/  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-24 00:04:50 +01:00  
				
					
						
							
							
								 
						
							
							
								38e93469d3 
								
							
								 
							
						 
						
							
							
								
								Fix broken test  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-23 09:01:44 +01:00  
				
					
						
							
							
								 
						
							
							
								8018a20680 
								
							
								 
							
						 
						
							
							
								
								create acceptance tests  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-21 17:40:34 +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  
				
					
						
							
							
								 
						
							
							
								2441cbc9ac 
								
							
								 
							
						 
						
							
							
								
								LeftPanel2 -> LeftPanel  
							
							
							
						 
						
							2020-07-17 15:22:18 -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  
				
					
						
							
							
								 
						
							
							
								e75b33c66c 
								
							
								 
							
						 
						
							
							
								
								fix e2e tests  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-17 19:41:45 +01:00  
				
					
						
							
							
								 
						
							
							
								4d61d6320a 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests  
							
							... 
							
							
							
							Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2020-07-16 15:12:32 +00:00  
				
					
						
							
							
								 
						
							
							
								226f755259 
								
							
								 
							
						 
						
							
							
								
								Match the string correctly  
							
							
							
						 
						
							2020-07-15 04:59:34 -06:00  
				
					
						
							
							
								 
						
							
							
								6994b8c5ea 
								
							
								 
							
						 
						
							
							
								
								Bob needs to accept the toast too  
							
							
							
						 
						
							2020-07-15 04:50:15 -06:00  
				
					
						
							
							
								 
						
							
							
								cc18438a0a 
								
							
								 
							
						 
						
							
							
								
								Fix another toast  
							
							
							
						 
						
							2020-07-15 04:32:07 -06:00  
				
					
						
							
							
								 
						
							
							
								2def39fef7 
								
							
								 
							
						 
						
							
							
								
								Fix brand too  
							
							
							
						 
						
							2020-07-15 04:21:37 -06:00  
				
					
						
							
							
								 
						
							
							
								86cb3cf93f 
								
							
								 
							
						 
						
							
							
								
								Incorporate new toasts into end-to-end tests  
							
							
							
						 
						
							2020-07-15 04:13:38 -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  
				
					
						
							
							
								 
						
							
							
								9bf2505e51 
								
							
								 
							
						 
						
							
							
								
								queryAll, not just query  
							
							
							
						 
						
							2020-07-07 16:48:03 -06:00  
				
					
						
							
							
								 
						
							
							
								9000888013 
								
							
								 
							
						 
						
							
							
								
								Pass the session through  
							
							
							
						 
						
							2020-07-07 16:38:24 -06:00  
				
					
						
							
							
								 
						
							
							
								f12d951209 
								
							
								 
							
						 
						
							
							
								
								Update end-to-end tests for new room list  
							
							
							
						 
						
							2020-07-07 16:34:42 -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  
				
					
						
							
							
								 
						
							
							
								65febd24eb 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2020-06-25 13:52:38 +01:00  
				
					
						
							
							
								 
						
							
							
								0acb35dc23 
								
							
								 
							
						 
						
							
							
								
								Update end to end tests  
							
							
							
						 
						
							2020-06-25 13:48:11 +01:00  
				
					
						
							
							
								 
						
							
							
								69c5aecfc7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4784  from bocoup/extend-querymatcher-heuristic  
							
							... 
							
							
							
							Extend QueryMatcher's sorting heuristic 
							
						 
						
							2020-06-18 19:36:42 +01:00  
				
					
						
							
							
								 
						
							
							
								e0a34d9dea 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Use recovery keys over passphrases"  
							
							
							
						 
						
							2020-06-18 09:35:11 +01:00  
				
					
						
							
							
								 
						
							
							
								6af4d82ce7 
								
							
								 
							
						 
						
							
							
								
								Extend QueryMatcher's sorting heuristic  
							
							... 
							
							
							
							Use the order of the input keys as a signal for relative importance of
matches.
Signed-off-by: Mike Pennisi <mike@mikepennisi.com> 
							
						 
						
							2020-06-17 23:41:41 -04:00  
				
					
						
							
							
								 
						
							
							
								803b7bb30f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4694  from justin-sleep/remove-escape-backslashes  
							
							... 
							
							
							
							Remove escape backslashes in non-Markdown messages 
							
						 
						
							2020-06-17 11:06:04 -06:00  
				
					
						
							
							
								 
						
							
							
								bdc451d66b 
								
							
								 
							
						 
						
							
							
								
								Remove escape backslashes in non-Markdown messages  
							
							
							
						 
						
							2020-06-03 17:08:13 -05:00  
				
					
						
							
							
								 
						
							
							
								0c1809bb38 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2020-06-03 13:24:56 +01:00  
				
					
						
							
							
								 
						
							
							
								802f9a4bc1 
								
							
								 
							
						 
						
							
							
								
								Fix end to end tests for new UI  
							
							
							
						 
						
							2020-06-03 13:04:29 +01:00  
				
					
						
							
							
								 
						
							
							
								5b31fdd308 
								
							
								 
							
						 
						
							
							
								
								remove stale references to MatrixToolbar  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-30 12:36:17 +01:00  
				
					
						
							
							
								 
						
							
							
								71108fcf39 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-27 17:02:32 +01:00  
				
					
						
							
							
								 
						
							
							
								7486338efa 
								
							
								 
							
						 
						
							
							
								
								Fix.the.tests.  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-27 16:51:04 +01:00  
				
					
						
							
							
								 
						
							
							
								e35c9d5bbf 
								
							
								 
							
						 
						
							
							
								
								more testing  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-27 15:18:43 +01:00  
				
					
						
							
							
								 
						
							
							
								cb07fa53f4 
								
							
								 
							
						 
						
							
							
								
								test  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-05-27 15:05:40 +01:00