Luke Barnard
							
						 
						
							 
							
							
							
								
							
								c0fc3ba3fe 
								
							
								 
							
						 
						
							
							
								
								Make redactions appear when the event has been redacted (on Room.redaction)  
							
							 
							
							
							
						 
						
							2017-03-06 14:20:24 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								edccfeb20b 
								
							
								 
							
						 
						
							
							
								
								No text required, do not continuate after redacted even  
							
							 
							
							... 
							
							
							
							It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender 
							
						 
						
							2017-03-06 10:26:26 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								abd71cd2ac 
								
							
								 
							
						 
						
							
							
								
								No need for "redactor" as we dont currently show it  
							
							 
							
							
							
						 
						
							2017-03-03 17:57:13 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9bae936816 
								
							
								 
							
						 
						
							
							
								
								Add the redacter display name to the redaction text  
							
							 
							
							
							
						 
						
							2017-03-03 17:35:42 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5ef61b7c35 
								
							
								 
							
						 
						
							
							
								
								Only show a redaction tile for messages  
							
							 
							
							
							
						 
						
							2017-03-03 16:45:29 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6c32e3720b 
								
							
								 
							
						 
						
							
							
								
								Remove seemingly unused "bounce"  
							
							 
							
							
							
						 
						
							2017-03-03 15:51:14 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2bd9885288 
								
							
								 
							
						 
						
							
							
								
								Start to show redacted events  
							
							 
							
							
							
						 
						
							2017-03-03 15:42:24 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1bdf213d67 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #729  from matrix-org/dbkr/register_ui_auth  
							
							 
							
							... 
							
							
							
							Port registration over to use InteractiveAuth 
							
						 
						
							2017-03-03 13:37:41 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								977b8a7379 
								
							
								 
							
						 
						
							
							
								
								Make UIAuth Dialog show an error  
							
							 
							
							... 
							
							
							
							when auth fails 
							
						 
						
							2017-03-03 12:08:26 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ab9aaa9174 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #732  from matrix-org/luke/fuse-test  
							
							 
							
							... 
							
							
							
							Test to see how fuse feels 
							
						 
						
							2017-03-03 10:46:41 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8522231d4f 
								
							
								 
							
						 
						
							
							
								
								Revery unintentional change  
							
							 
							
							... 
							
							
							
							to when teamToken was returned 
							
						 
						
							2017-03-03 10:28:10 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b822bc66ee 
								
							
								 
							
						 
						
							
							
								
								Remove redundant null check  
							
							 
							
							
							
						 
						
							2017-03-03 10:22:02 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7be55ce65c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #733  from matrix-org/luke/display-name-blur-to-submit  
							
							 
							
							... 
							
							
							
							Submit a new display name on blur of input field 
							
						 
						
							2017-03-03 10:03:21 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6a007d01a1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #610  from matrix-org/luke/feature-css-msg-colors  
							
							 
							
							... 
							
							
							
							Allow [bf]g colors for <font> style attrib 
							
						 
						
							2017-03-03 08:35:32 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f4278b61ea 
								
							
								 
							
						 
						
							
							
								
								Update comment  
							
							 
							
							
							
						 
						
							2017-03-02 18:13:01 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								1d5e47cd70 
								
							
								 
							
						 
						
							
							
								
								On cancel, blur. Only onValueChanged when the value has changed...  
							
							 
							
							
							
						 
						
							2017-03-02 18:07:24 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7a092e4ac7 
								
							
								 
							
						 
						
							
							
								
								Submit a new display name on blur of input field  
							
							 
							
							
							
						 
						
							2017-03-02 17:29:06 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0f8ab99158 
								
							
								 
							
						 
						
							
							
								
								Have COLOR_REGEX constant  
							
							 
							
							
							
						 
						
							2017-03-02 17:02:00 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c6782af6f 
								
							
								 
							
						 
						
							
							
								
								Oops, lost trackPromise  
							
							 
							
							
							
						 
						
							2017-03-02 15:08:15 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								91ef26a7f8 
								
							
								 
							
						 
						
							
							
								
								makeRegistrationUrl is required  
							
							 
							
							
							
						 
						
							2017-03-02 15:04:10 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								51b2001f70 
								
							
								 
							
						 
						
							
							
								
								Remove todo which is now done!  
							
							 
							
							
							
						 
						
							2017-03-02 15:03:24 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								88586a0823 
								
							
								 
							
						 
						
							
							
								
								Oops, lost defaultDeviceDisplayName  
							
							 
							
							
							
						 
						
							2017-03-02 15:01:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0914226327 
								
							
								 
							
						 
						
							
							
								
								Actuall pass our proxy makeRegistrationUrl  
							
							 
							
							
							
						 
						
							2017-03-02 14:47:47 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3028b335a4 
								
							
								 
							
						 
						
							
							
								
								Oops, re-add referrer param  
							
							 
							
							... 
							
							
							
							as Registration was still using it 
							
						 
						
							2017-03-02 14:46:18 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dd762cc835 
								
							
								 
							
						 
						
							
							
								
								Add makeRegistrationUrl to proptypes  
							
							 
							
							
							
						 
						
							2017-03-02 14:40:55 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a5cf3a964b 
								
							
								 
							
						 
						
							
							
								
								doc  
							
							 
							
							
							
						 
						
							2017-03-02 14:39:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								518a749d90 
								
							
								 
							
						 
						
							
							
								
								Add proptypes / isRequired  
							
							 
							
							
							
						 
						
							2017-03-02 14:36:54 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								770c1ce11f 
								
							
								 
							
						 
						
							
							
								
								Remove redundant prop  
							
							 
							
							
							
						 
						
							2017-03-02 14:35:08 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								e75c21e9f9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #683  from matrix-org/luke/mels-xor  
							
							 
							
							... 
							
							
							
							MELS: either expanded or summary, not both 
							
						 
						
							2017-03-02 14:08:06 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8be66d0f04 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #730  from Half-Shot/hs/video-gif-autoplay  
							
							 
							
							... 
							
							
							
							Autoplay videos and GIFs if enabled by the user. 
							
						 
						
							2017-03-02 13:41:30 +00:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								4b5e8d66b8 
								
							
								 
							
						 
						
							
							
								
								Fixed styling + removed log line  
							
							 
							
							
							
						 
						
							2017-03-02 13:39:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0035a91596 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #731  from matrix-org/luke/warn-users-e2e-first-time  
							
							 
							
							... 
							
							
							
							Warn users about using e2e for the first time 
							
						 
						
							2017-03-02 13:28:15 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								95cff17698 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #721  from matrix-org/luke/fix-refactor-UnknownDeviceDialog  
							
							 
							
							... 
							
							
							
							Show UDDialog on UDE during VoIP calls 
							
						 
						
							2017-03-02 13:13:45 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b951713f7f 
								
							
								 
							
						 
						
							
							
								
								Remove custom attribs as consumed  
							
							 
							
							
							
						 
						
							2017-03-02 11:39:40 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								36795fa192 
								
							
								 
							
						 
						
							
							
								
								Use data-mx[-bg]-color instead of stripping style  
							
							 
							
							... 
							
							
							
							This has the benefit of not needing a spec for custom CSS. Instead we rigourously sanitise the values for custom data attributes that are transformed to CSS equivalents. `data-mx-color` translates to CSS `color` for example. 
							
						 
						
							2017-03-02 11:36:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c5fb00da4 
								
							
								 
							
						 
						
							
							
								
								Fix syntax  
							
							 
							
							
							
						 
						
							2017-03-01 18:33:45 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ef5d2bca91 
								
							
								 
							
						 
						
							
							
								
								Get errorText from error in stageUpdated  
							
							 
							
							
							
						 
						
							2017-03-01 16:59:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c9ef879afa 
								
							
								 
							
						 
						
							
							
								
								PR feedback: Move the email token request here  
							
							 
							
							
							
						 
						
							2017-03-01 16:04:15 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b7bd93c613 
								
							
								 
							
						 
						
							
							
								
								var -> const  
							
							 
							
							
							
						 
						
							2017-03-01 15:55:15 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								187c91b76a 
								
							
								 
							
						 
						
							
							
								
								Adjust warning message  
							
							 
							
							
							
						 
						
							2017-03-01 15:42:05 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6d296a0e7a 
								
							
								 
							
						 
						
							
							
								
								Warn users about using e2e for the first time  
							
							 
							
							
							
						 
						
							2017-03-01 15:41:13 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								39427839b9 
								
							
								 
							
						 
						
							
							
								
								Use ES6 export style  
							
							 
							
							
							
						 
						
							2017-03-01 14:33:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dd33624454 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth  
							
							 
							
							... 
							
							
							
							(This ended up mostly being merged by hand as git made a complete
mess of the merge) 
							
						 
						
							2017-03-01 10:45:17 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f85c452e35 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #726  from matrix-org/luke/rts-set-team-token-on-login  
							
							 
							
							... 
							
							
							
							Notify MatrixChat of teamToken after login 
							
						 
						
							2017-02-28 15:57:22 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								a339316ede 
								
							
								 
							
						 
						
							
							
								
								Use a "normal" promise in order to .then  
							
							 
							
							
							
						 
						
							2017-02-28 15:40:49 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0ef8e2a8f4 
								
							
								 
							
						 
						
							
							
								
								Various fixes  
							
							 
							
							
							
						 
						
							2017-02-28 15:18:00 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								48a3d0d595 
								
							
								 
							
						 
						
							
							
								
								Refactor to not set team token in bad ways  
							
							 
							
							... 
							
							
							
							Use the on_logged_in dispatch instead. Call setPage in one place, _onLoggedIn, when deciding which page to view on login. Change some require to import, var to const. Remove onTeamMemberRegistered and just use a nullable argument to onRegistered 
							
						 
						
							2017-02-28 15:05:49 +00:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								1995c16013 
								
							
								 
							
						 
						
							
							
								
								Add a user option to enable autoplaying gifs and videos.  
							
							 
							
							
							
						 
						
							2017-02-27 22:17:43 +00:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								4509901592 
								
							
								 
							
						 
						
							
							
								
								image (gifs) and video messages will autoplay if enabled.  
							
							 
							
							
							
						 
						
							2017-02-27 22:16:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c22db1db5f 
								
							
								 
							
						 
						
							
							
								
								Fix race when signup is completed elsewhere  
							
							 
							
							... 
							
							
							
							as commented 
							
						 
						
							2017-02-27 18:22:26 +00:00