a008f5010a 
								
							
								 
							
						 
						
							
							
								
								Fix the ctrl+e mute camera shortcut  
							
							... 
							
							
							
							* Fixes the altgr+e shortcut on Windows
   (Fixes https://github.com/vector-im/vector-web/issues/2561 )
 * Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
   which is more normal and doesn't clobber ctrl+e which old
   school unix types use for go-to-end-of-line. 
							
						 
						
							2016-11-08 18:04:22 +00:00  
				
					
						
							
							
								 
						
							
							
								884ae0e218 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #541  from matrix-org/dbkr/dont_preview_matrix_to  
							
							... 
							
							
							
							Don't do URL previews for matrix.to 
							
						 
						
							2016-11-07 12:32:33 +00:00  
				
					
						
							
							
								 
						
							
							
								5c2c01d414 
								
							
								 
							
						 
						
							
							
								
								Fix function to consistently return boolean  
							
							
							
						 
						
							2016-11-07 11:45:55 +00:00  
				
					
						
							
							
								 
						
							
							
								2bb7aec0de 
								
							
								 
							
						 
						
							
							
								
								Don't do URL previews for matrix.to  
							
							
							
						 
						
							2016-11-07 10:57:08 +00:00  
				
					
						
							
							
								 
						
							
							
								b86f9f362a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #540  from matrix-org/rav/fix_npe  
							
							... 
							
							
							
							Fix NPE in LoggedInView 
							
						 
						
							2016-11-07 09:57:46 +00:00  
				
					
						
							
							
								 
						
							
							
								2ee98e9fdc 
								
							
								 
							
						 
						
							
							
								
								Fix NPE in LoggedInView  
							
							... 
							
							
							
							Fixes a NPE displaying the new version bar
(also fix displayname for WithMatrixClient) 
							
						 
						
							2016-11-07 09:28:10 +00:00  
				
					
						
							
							
								 
						
							
							
								c973dbf1c4 
								
							
								 
							
						 
						
							
							
								
								0.7.5 has been released  
							
							
							
						 
						
							2016-11-04 13:02:12 +00:00  
				
					
						
							
							
								 
						
							
							
								5ac0aac65b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #538  from matrix-org/dbkr/matrix_to_links  
							
							... 
							
							
							
							Make room alias & user ID links matrix.to links 
							
						 
						
							2016-11-04 11:42:49 +00:00  
				
					
						
							
							
								 
						
							
							
								04c27205a3 
								
							
								 
							
						 
						
							
							
								
								Make room alias & user ID links matrix.to links  
							
							
							
						 
						
							2016-11-04 11:38:28 +00:00  
				
					
						
							
							
								 
						
							
							
								3a0b63dbda 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #537  from matrix-org/rav/memberinfo_use_client_from_context  
							
							... 
							
							
							
							Make MemberInfo use the matrixclient from the context 
							
						 
						
							2016-11-04 10:59:11 +00:00  
				
					
						
							
							
								 
						
							
							
								f301e55b6e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context  
							
							
							
						 
						
							2016-11-04 10:54:32 +00:00  
				
					
						
							
							
								 
						
							
							
								0ab46df94a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #536  from matrix-org/rav/add_client_to_context  
							
							... 
							
							
							
							Add the MatrixClient to the react context 
							
						 
						
							2016-11-04 10:54:11 +00:00  
				
					
						
							
							
								 
						
							
							
								da10660c86 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context  
							
							
							
						 
						
							2016-11-04 10:35:41 +00:00  
				
					
						
							
							
								 
						
							
							
								bd36792303 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #535  from matrix-org/rav/factor_out_loggedinpanel  
							
							... 
							
							
							
							Factor out LoggedInView from MatrixChat 
							
						 
						
							2016-11-04 10:34:52 +00:00  
				
					
						
							
							
								 
						
							
							
								6de5713543 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2016-11-04 10:11:24 +00:00  
				
					
						
							
							
								 
						
							
							
								1368d90e66 
								
							
								 
							
						 
						
							
							
								
								v0.7.5  
							
							
							
						 
						
							2016-11-04 10:09:11 +00:00  
				
					
						
							
							
								 
						
							
							
								d7bc408070 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.7.5  
							
							
							
						 
						
							2016-11-04 10:09:10 +00:00  
				
					
						
							
							
								 
						
							
							
								fa967da2a9 
								
							
								 
							
						 
						
							
							
								
								matrix-js-sdk 0.6.4  
							
							
							
						 
						
							2016-11-04 10:07:50 +00:00  
				
					
						
							
							
								 
						
							
							
								cb5b311e44 
								
							
								 
							
						 
						
							
							
								
								Move saveScrollState into RoomView  
							
							... 
							
							
							
							It fits much more naturally here than in LoggedInView. 
							
						 
						
							2016-11-04 09:28:35 +00:00  
				
					
						
							
							
								 
						
							
							
								ab7007784f 
								
							
								 
							
						 
						
							
							
								
								Make MemberInfo use the matrixclient from the context  
							
							... 
							
							
							
							An arbitrary component to demonstrate how this works 
							
						 
						
							2016-11-03 19:05:48 +00:00  
				
					
						
							
							
								 
						
							
							
								d3f20e1d9d 
								
							
								 
							
						 
						
							
							
								
								Add the MatrixClient to the react context  
							
							... 
							
							
							
							Because that's the reacty way 
							
						 
						
							2016-11-03 19:02:27 +00:00  
				
					
						
							
							
								 
						
							
							
								f85a37c667 
								
							
								 
							
						 
						
							
							
								
								Factor out LoggedInView from MatrixChat  
							
							... 
							
							
							
							The idea here is to make a layer which sits around for as long as we have a
valid MatrixClient. Also it makes a plausible split for the render of
MatrixChat, even if they are much too tightly bound for now. 
							
						 
						
							2016-11-03 18:59:32 +00:00  
				
					
						
							
							
								 
						
							
							
								31a47a9efd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #532  from matrix-org/dbkr/platform_version  
							
							... 
							
							
							
							Move 'new version' support into Platform 
							
						 
						
							2016-11-03 13:30:30 +00:00  
				
					
						
							
							
								 
						
							
							
								8cafe4936d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/platform_version  
							
							
							
						 
						
							2016-11-03 11:51:06 +00:00  
				
					
						
							
							
								 
						
							
							
								d408b7c180 
								
							
								 
							
						 
						
							
							
								
								Fix copyright  
							
							
							
						 
						
							2016-11-03 11:47:57 +00:00  
				
					
						
							
							
								 
						
							
							
								5ae4228bfe 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/platform_version  
							
							
							
						 
						
							2016-11-02 19:45:40 +00:00  
				
					
						
							
							
								 
						
							
							
								0944408946 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #534  from matrix-org/dbkr/platform_notification  
							
							... 
							
							
							
							Move Notifications into Platform 
							
						 
						
							2016-11-02 19:44:12 +00:00  
				
					
						
							
							
								 
						
							
							
								743e54f9bb 
								
							
								 
							
						 
						
							
							
								
								Specify promise arg  
							
							
							
						 
						
							2016-11-02 19:23:09 +00:00  
				
					
						
							
							
								 
						
							
							
								bd3fa6a7c5 
								
							
								 
							
						 
						
							
							
								
								Move version specific stuff to vector  
							
							
							
						 
						
							2016-11-02 17:44:57 +00:00  
				
					
						
							
							
								 
						
							
							
								920e3346dc 
								
							
								 
							
						 
						
							
							
								
								Move Notifications into Platform  
							
							... 
							
							
							
							Also add support for clearing notifications if the Platform
supports it. 
							
						 
						
							2016-11-02 17:35:31 +00:00  
				
					
						
							
							
								 
						
							
							
								b057577b15 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into dbkr/platform_version  
							
							
							
						 
						
							2016-11-02 16:34:43 +00:00  
				
					
						
							
							
								 
						
							
							
								58c0e0e056 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #531  from matrix-org/dbkr/platform  
							
							... 
							
							
							
							Move platform-specific functionality into Platform 
							
						 
						
							2016-11-02 16:20:20 +00:00  
				
					
						
							
							
								 
						
							
							
								29bdf992ff 
								
							
								 
							
						 
						
							
							
								
								s/fir/for/  
							
							
							
						 
						
							2016-11-02 16:15:35 +00:00  
				
					
						
							
							
								 
						
							
							
								3c4370c180 
								
							
								 
							
						 
						
							
							
								
								Move 'new version' support into Platform  
							
							... 
							
							
							
							Also adds support for the platform providing a changelog 
							
						 
						
							2016-11-02 15:58:17 +00:00  
				
					
						
							
							
								 
						
							
							
								f433f9ca32 
								
							
								 
							
						 
						
							
							
								
								Move platform-specific functionality into Platform  
							
							... 
							
							
							
							Platform classes are provided by the application via
PlatformPeg.set(). 
							
						 
						
							2016-11-02 15:10:21 +00:00  
				
					
						
							
							
								 
						
							
							
								f2e59f1bd3 
								
							
								 
							
						 
						
							
							
								
								matrix-js-sdk dep back to develop  
							
							
							
						 
						
							2016-11-02 11:10:20 +00:00  
				
					
						
							
							
								 
						
							
							
								a8a6a9d73d 
								
							
								 
							
						 
						
							
							
								
								v0.7.5-rc.1  
							
							
							
						 
						
							2016-11-02 11:08:02 +00:00  
				
					
						
							
							
								 
						
							
							
								6cd55e0811 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.7.5-rc.1  
							
							
							
						 
						
							2016-11-02 11:08:02 +00:00  
				
					
						
							
							
								 
						
							
							
								2cb9e606be 
								
							
								 
							
						 
						
							
							
								
								Use released js-sdk  
							
							
							
						 
						
							2016-11-02 11:03:52 +00:00  
				
					
						
							
							
								 
						
							
							
								a6417c287f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #530  from matrix-org/dbkr/no_pack_world  
							
							... 
							
							
							
							Explicitly list files in package.json 
							
						 
						
							2016-11-01 15:27:21 +00:00  
				
					
						
							
							
								 
						
							
							
								ce19739899 
								
							
								 
							
						 
						
							
							
								
								Remove .npmignore as it's superseeded by 'files'  
							
							... 
							
							
							
							And also seems to be out of date anyway 
							
						 
						
							2016-11-01 15:16:49 +00:00  
				
					
						
							
							
								 
						
							
							
								3e8fcac303 
								
							
								 
							
						 
						
							
							
								
								Explicitly list file sin package.json  
							
							... 
							
							
							
							To avoid publishing whatever happens to be in the working copy.
Equivalent of https://github.com/vector-im/vector-web/pull/2516 
for react-sdk. 
							
						 
						
							2016-11-01 15:15:31 +00:00  
				
					
						
							
							
								 
						
							
							
								9e69b48762 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #529  from matrix-org/rav/fix_codestyle_quoting  
							
							... 
							
							
							
							Fix some markdown in the code style doc 
							
						 
						
							2016-11-01 13:13:22 +00:00  
				
					
						
							
							
								 
						
							
							
								86a24fb5de 
								
							
								 
							
						 
						
							
							
								
								Fix some markdown ih the code style doc  
							
							
							
						 
						
							2016-11-01 11:33:06 +00:00  
				
					
						
							
							
								 
						
							
							
								8349ea4b0e 
								
							
								 
							
						 
						
							
							
								
								fix code style for ES6 classes  
							
							
							
						 
						
							2016-11-01 10:58:56 +00:00  
				
					
						
							
							
								 
						
							
							
								a53c1958eb 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #527  from matrix-org/dbkr/highlight_async  
							
							... 
							
							
							
							Run highlight.js asynchronously 
							
						 
						
							2016-10-27 09:57:23 +01:00  
				
					
						
							
							
								 
						
							
							
								974e4c05c8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #528  from matrix-org/rav/fix_tinting  
							
							... 
							
							
							
							Fix room tinting 
							
						 
						
							2016-10-27 09:57:00 +01:00  
				
					
						
							
							
								 
						
							
							
								6246fdee7c 
								
							
								 
							
						 
						
							
							
								
								Fix room tinting  
							
							... 
							
							
							
							Looks like the cachebuster stuff in
https://github.com/vector-im/vector-web/pull/2515  broke room tinting. Add a
fix, along with some ranting. 
							
						 
						
							2016-10-26 23:11:34 +01:00  
				
					
						
							
							
								 
						
							
							
								8cf273a460 
								
							
								 
							
						 
						
							
							
								
								Run highlight.js asynchronously  
							
							... 
							
							
							
							Move the very minimal logic of highlightDOM into TextualBody
because then we can avoid scheduling a lot of timeouts which
would ultimately do nothing (ie. any messages that don't have code
blocks). 
							
						 
						
							2016-10-26 18:41:28 +01:00  
				
					
						
							
							
								 
						
							
							
								8395717f9b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #525  from matrix-org/dbkr/fix_spin_on_join  
							
							... 
							
							
							
							Fix CPU spin on joining rooms 
							
						 
						
							2016-10-26 15:46:42 +01:00