Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							85770feb31 
							
						 
					 
					
						
						
							
							device verification: use a js-sdk event  
						
						... 
						
						
						
						We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this. 
						
						
					 
					
						2016-06-08 21:25:42 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							c123f02842 
							
						 
					 
					
						
						
							
							Make the config optional  
						
						
						
						
					 
					
						2016-06-08 18:45:46 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							7ce49c752f 
							
						 
					 
					
						
						
							
							Wire up events to update UI on device verification  
						
						... 
						
						
						
						Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified. 
						
						
					 
					
						2016-06-08 18:35:43 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b5ff247f09 
							
						 
					 
					
						
						
							
							Merge pull request  #299  from matrix-org/dbkr/SdkConfig  
						
						... 
						
						
						
						Pass brand parameter down to Notifications 
						
						
					 
					
						2016-06-08 17:34:10 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							1616431d27 
							
						 
					 
					
						
						
							
							EventTile: add classes to indicate verifiedness  
						
						... 
						
						
						
						Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not. 
						
						
					 
					
						2016-06-08 17:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f3e66e6fd2 
							
						 
					 
					
						
						
							
							Add device info to member info  
						
						... 
						
						
						
						Requires e81ce23 in matrix-js-sdk 
						
						
					 
					
						2016-06-08 17:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							086698cd11 
							
						 
					 
					
						
						
							
							Add device info to user settings  
						
						... 
						
						
						
						Requires e81ce23 from matrix-js-sdk 
						
						
					 
					
						2016-06-08 17:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							7e8c8dd336 
							
						 
					 
					
						
						
							
							Remove SdkConfig  
						
						... 
						
						
						
						just take a config in MatrixChat, pass the individual things down through the chain.
This may become unwieldy: let's see how it goes. 
						
						
					 
					
						2016-06-08 14:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							12816c5e1f 
							
						 
					 
					
						
						
							
							Explanatory comment  
						
						
						
						
					 
					
						2016-06-07 22:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d063735c96 
							
						 
					 
					
						
						
							
							Use variable for key name  
						
						
						
						
					 
					
						2016-06-07 22:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							33251e6566 
							
						 
					 
					
						
						
							
							Remove default options that shouldn't be part of this PR  
						
						
						
						
					 
					
						2016-06-07 22:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b54376aa2a 
							
						 
					 
					
						
						
							
							Add singleton object to hold SDK configuration  
						
						
						
						
					 
					
						2016-06-07 21:49:06 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							aca0e060a4 
							
						 
					 
					
						
						
							
							Also change velocity-vector commit & requires  
						
						... 
						
						
						
						Because it needs a versiob where the package name is actually updated and the requires need to use the right package name 
						
						
					 
					
						2016-06-07 20:47:37 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							8679ce80c8 
							
						 
					 
					
						
						
							
							Update vector velocity fork package name  
						
						
						
						
					 
					
						2016-06-07 20:28:38 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a4352dee50 
							
						 
					 
					
						
						
							
							Merge pull request  #298  from matrix-org/dbkr/velocity_mem_leak2  
						
						... 
						
						
						
						Second attempt at fixing the Velocity memory leak 
						
						
					 
					
						2016-06-07 19:55:41 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							943d7e18e1 
							
						 
					 
					
						
						
							
							Add _ to internal member  
						
						
						
						
					 
					
						2016-06-07 19:55:24 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d5a522fdfe 
							
						 
					 
					
						
						
							
							Second attempt at fixing the Velocity memory leak  
						
						... 
						
						
						
						1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package 
						
						
					 
					
						2016-06-07 18:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							15dccd9871 
							
						 
					 
					
						
						
							
							Handle errors with scalar-oauthing  
						
						... 
						
						
						
						Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error). 
						
						
					 
					
						2016-06-06 17:55:45 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcebe1e56 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/scalar  
						
						
						
						
					 
					
						2016-06-06 17:19:38 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							507f5e2ca1 
							
						 
					 
					
						
						
							
							0.6.3  
						
						
						
						
					 
					
						2016-06-03 12:17:46 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							9e17c0ddd1 
							
						 
					 
					
						
						
							
							Prepare changelog for v0.6.3  
						
						
						
						
					 
					
						2016-06-03 12:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b3128645 
							
						 
					 
					
						
						
							
							invite input box wording for amandine  
						
						
						
						
					 
					
						2016-06-02 23:33:55 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3c8481f6 
							
						 
					 
					
						
						
							
							fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged  
						
						
						
						
					 
					
						2016-06-02 21:07:47 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							532e93d7cb 
							
						 
					 
					
						
						
							
							fix up trailing whitespace and put the buttons in the right order  
						
						
						
						
					 
					
						2016-06-02 21:07:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e20a1acb88 
							
						 
					 
					
						
						
							
							label our versions sensibly  
						
						
						
						
					 
					
						2016-06-02 19:22:11 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b06ab78a81 
							
						 
					 
					
						
						
							
							0.6.2  
						
						
						
						
					 
					
						2016-06-02 18:55:34 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5ecbd10d36 
							
						 
					 
					
						
						
							
							Prepare changelog for v0.6.2  
						
						
						
						
					 
					
						2016-06-02 18:55:34 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							168f74d6cf 
							
						 
					 
					
						
						
							
							correctly bump dep on js-sdk 0.5.4  
						
						
						
						
					 
					
						2016-06-02 18:53:50 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							204437e40c 
							
						 
					 
					
						
						
							
							0.6.1  
						
						
						
						
					 
					
						2016-06-02 18:32:50 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d857859d51 
							
						 
					 
					
						
						
							
							Prepare changelog for v0.6.1  
						
						
						
						
					 
					
						2016-06-02 18:32:50 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							487f3c72dd 
							
						 
					 
					
						
						
							
							fix new 3pid invite UI  
						
						
						
						
					 
					
						2016-06-02 16:59:44 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5379956b0d 
							
						 
					 
					
						
						
							
							jenkins.sh: remove spurious 'npm install'  
						
						... 
						
						
						
						Just let npm install matrix-js-sdk, rather than installing the one from jenkins 
						
						
					 
					
						2016-06-02 16:42:19 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							268cedee0f 
							
						 
					 
					
						
						
							
							0.6.0  
						
						
						
						
					 
					
						2016-06-02 13:38:19 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9a77796d77 
							
						 
					 
					
						
						
							
							Prepare changelog for v0.6.0  
						
						
						
						
					 
					
						2016-06-02 13:38:18 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d812c77fc1 
							
						 
					 
					
						
						
							
							Bump to js-sdk 0.5.3  
						
						
						
						
					 
					
						2016-06-02 13:36:45 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							1d31463140 
							
						 
					 
					
						
						
							
							set email branding after registration  
						
						
						
						
					 
					
						2016-06-02 13:14:52 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							83fd02bdfa 
							
						 
					 
					
						
						
							
							specify a brand when registering accounts  
						
						
						
						
					 
					
						2016-06-02 11:51:26 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0ef0120227 
							
						 
					 
					
						
						
							
							Merge pull request  #297  from matrix-org/matthew/new-3pid-invite  
						
						... 
						
						
						
						implement new UX for 3pid invites 
						
						
					 
					
						2016-06-02 11:24:21 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							3b34311e05 
							
						 
					 
					
						
						
							
							implement new UX for 3pid invites  
						
						
						
						
					 
					
						2016-06-01 23:42:34 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0747ca3923 
							
						 
					 
					
						
						
							
							ignore @ prefixes when sorting memberlist  
						
						
						
						
					 
					
						2016-06-01 14:00:20 +01:00 
						 
				 
			
				
					
						
							
							
								Aviral Dasgupta 
							
						 
					 
					
						
						
						
						
							
						
						
							b979a16199 
							
						 
					 
					
						
						
							
							initial version of autocomplete  
						
						
						
						
					 
					
						2016-06-01 16:54:21 +05:30 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							272afe39dc 
							
						 
					 
					
						
						
							
							do not list rooms by default  
						
						
						
						
					 
					
						2016-06-01 02:03:53 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							c3fc76cdaa 
							
						 
					 
					
						
						
							
							warn guests to register nicely to upload files  
						
						
						
						
					 
					
						2016-05-31 23:59:36 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ba7df66e 
							
						 
					 
					
						
						
							
							fix the Add button for email addies  
						
						
						
						
					 
					
						2016-05-31 23:50:53 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							2662ca36f9 
							
						 
					 
					
						
						
							
							fix tag unsetting  https://github.com/vector-im/vector-web/issues/1499  - HOW DID THIS EVER WORK?!?!  
						
						
						
						
					 
					
						2016-05-31 23:50:47 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b74d690035 
							
						 
					 
					
						
						
							
							Merge pull request  #290  from matrix-org/matthew/multipreview  
						
						... 
						
						
						
						multiple URL preview support 
						
						
					 
					
						2016-05-31 19:42:21 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b3638f9169 
							
						 
					 
					
						
						
							
							PR review  
						
						
						
						
					 
					
						2016-05-31 19:42:00 +01:00 
						 
				 
			
				
					
						
							
							
								Aviral Dasgupta 
							
						 
					 
					
						
						
						
						
							
						
						
							96526c22c5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature-rte  
						
						
						
						
					 
					
						2016-05-29 20:50:33 +05:30 
						 
				 
			
				
					
						
							
							
								Aviral Dasgupta 
							
						 
					 
					
						
						
						
						
							
						
						
							fe76eb9f73 
							
						 
					 
					
						
						
							
							minor improvements  
						
						... 
						
						
						
						- use <p> for unstyled blocks
- fix return key bug
- editor placeholder 
						
						
					 
					
						2016-05-28 12:02:35 +05:30 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a145ab7e28 
							
						 
					 
					
						
						
							
							Merge pull request  #293  from matrix-org/dbkr/fallback_hs_login  
						
						... 
						
						
						
						Add a fallback home server to log into 
						
						
					 
					
						2016-05-27 15:48:30 +01:00