Travis Ralston
							
						 
					 | 
					
						
						
							
						
						90a898d03f
					 | 
					
						
						
							
							Move dispatcher into a subdirectory
						
						
						
						
						
						
						
						We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in. 
						
						
					 | 
					
						2020-05-13 21:07:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bruno Windels
							
						 
					 | 
					
						
						
							
						
						33391a3110
					 | 
					
						
						
							
							Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"
						
						
						
						
						
						
					 | 
					
						2020-04-16 09:25:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bruno Windels
							
						 
					 | 
					
						
						
							
						
						15075e4c10
					 | 
					
						
						
							
							load twemoji in matrixclient rather than loggedinview
						
						
						
						
						
						
					 | 
					
						2020-04-16 10:40:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						7fa38933cb
					 | 
					
						
						
							
							Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
						
						
						
						
						
						
						
						 Conflicts:
	src/components/structures/LoggedInView.tsx 
						
						
					 | 
					
						2020-04-14 15:54:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						26569dea06
					 | 
					
						
						
							
							Revert "@replaceableComponent"
						
						
						
						
						
						
						
						This reverts commit 50d6551c
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 | 
					
						2020-04-14 14:59:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						50d6551c86
					 | 
					
						
						
							
							@replaceableComponent
						
						
						
						
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 | 
					
						2020-04-14 14:50:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						46f7fadf3f
					 | 
					
						
						
							
							delint
						
						
						
						
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 | 
					
						2020-04-13 14:33:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						96c067a6c4
					 | 
					
						
						
							
							prefer protected over private so that the class can be extended
						
						
						
						
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 | 
					
						2020-04-13 14:30:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Telatynski
							
						 
					 | 
					
						
						
							
						
						368e3f9e85
					 | 
					
						
						
							
							Convert LoggedInView to TypeScript
						
						
						
						
						
						
						
						Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
						
						
					 | 
					
						2020-04-13 14:29:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |