e9318f5c02 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #722  from matrix-org/luke/fix-status-bar-tab-complete  
							
							... 
							
							
							
							Fix status bar expanded on tab-complete 
							
						 
						
							2017-02-22 14:33:29 +00:00  
				
					
						
							
							
								 
						
							
							
								f230b0a3c0 
								
							
								 
							
						 
						
							
							
								
								Fix status bar expanded on tab-complete  
							
							... 
							
							
							
							This had regressed when `_getSize` was introduced. It didn't consider tab completing. 
							
						 
						
							2017-02-22 14:03:30 +00:00  
				
					
						
							
							
								 
						
							
							
								f600121dd5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #713  from aviraldg/add-editorconfig  
							
							... 
							
							
							
							add .editorconfig 
							
						 
						
							2017-02-21 18:06:41 +00:00  
				
					
						
							
							
								 
						
							
							
								e0724e7521 
								
									
								
							
								 
							
						 
						
							
							
								
								add .editorconfig  
							
							... 
							
							
							
							Signed-off-by: Aviral Dasgupta <me@aviraldg.com> 
							
						 
						
							2017-02-21 23:29:55 +05:30  
				
					
						
							
							
								 
						
							
							
								7cbd5a7f07 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #719  from matrix-org/kegan/db-name  
							
							... 
							
							
							
							Change the name of the database 
							
						 
						
							2017-02-21 17:18:41 +00:00  
				
					
						
							
							
								 
						
							
							
								658c34abf3 
								
							
								 
							
						 
						
							
							
								
								Change the name of the database  
							
							... 
							
							
							
							Full name is now `matrix-js-sdk:riot-web-sync`. 
							
						 
						
							2017-02-21 15:44:57 +00:00  
				
					
						
							
							
								 
						
							
							
								05d242cb5c 
								
							
								 
							
						 
						
							
							
								
								allow @local:domain style mxids  
							
							
							
						 
						
							2017-02-21 14:50:09 +00:00  
				
					
						
							
							
								 
						
							
							
								995e59b973 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #716  from matrix-org/luke/feature-default-hs  
							
							... 
							
							
							
							Allow setting the default HS from the query parameter 
							
						 
						
							2017-02-21 14:43:36 +00:00  
				
					
						
							
							
								 
						
							
							
								454dc8e7b8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #717  from matrix-org/matthew/auth-cache  
							
							... 
							
							
							
							first cut of improving UX for deleting devices. 
							
						 
						
							2017-02-21 09:51:00 +00:00  
				
					
						
							
							
								 
						
							
							
								629f8caad7 
								
							
								 
							
						 
						
							
							
								
								oops, remove unneeded import  
							
							
							
						 
						
							2017-02-21 09:50:10 +00:00  
				
					
						
							
							
								 
						
							
							
								aabf9255d2 
								
							
								 
							
						 
						
							
							
								
								anchor the authcache on LoggedInView to prevent it persisting over logouts  
							
							
							
						 
						
							2017-02-21 01:03:22 +00:00  
				
					
						
							
							
								 
						
							
							
								6af0b9618a 
								
							
								 
							
						 
						
							
							
								
								first cut of improving UX for deleting devices.  
							
							... 
							
							
							
							This adds a 5 minute auth cache to speed up the process of deleting
old devices.  It has the following nastinesses (mainly due to being
written on a flight whilst juggling kids):
 * the auth cache is done as context attached to MatrixChat.
   one could argue that it should be per-client instead, but we don't
   yet have multiple clients.
 * the auth cache is only maintained currently in DevicesPanelEntry
   (i.e. set & invalidated).  One could argue that it might be better
   maintained in InteractiveAuth.js or a dedicated cache object
   abstraction, but given the only use I can think of is when managing
   devices, perhaps this is good enough for now. 
							
						 
						
							2017-02-21 00:19:49 +00:00  
				
					
						
							
							
								 
						
							
							
								9eef3c53a3 
								
							
								 
							
						 
						
							
							
								
								Allow setting the default HS from the query parameter  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3207  
							
						 
						
							2017-02-20 16:53:26 +00:00  
				
					
						
							
							
								 
						
							
							
								7d07e7f958 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #711  from matrix-org/dbkr/fix_commonmark_quote_multiline  
							
							... 
							
							
							
							Fix block quotes all being on a single line 
							
						 
						
							2017-02-20 09:19:41 +00:00  
				
					
						
							
							
								 
						
							
							
								8990e770b7 
								
							
								 
							
						 
						
							
							
								
								fix colouring in voip dark theme  
							
							
							
						 
						
							2017-02-20 01:43:55 +02:00  
				
					
						
							
							
								 
						
							
							
								5ac76acc05 
								
							
								 
							
						 
						
							
							
								
								limit avatar uploads to images  
							
							
							
						 
						
							2017-02-19 02:07:08 +02:00  
				
					
						
							
							
								 
						
							
							
								e79d38467b 
								
							
								 
							
						 
						
							
							
								
								Oops, un-hardcode correctly  
							
							
							
						 
						
							2017-02-17 19:27:50 +00:00  
				
					
						
							
							
								 
						
							
							
								1819ff0939 
								
							
								 
							
						 
						
							
							
								
								Un-hardcode home in jenkins.sh  
							
							
							
						 
						
							2017-02-17 19:26:21 +00:00  
				
					
						
							
							
								 
						
							
							
								4f4e9a6c3a 
								
							
								 
							
						 
						
							
							
								
								Fix block quotes all being on a single line  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3154  
							
						 
						
							2017-02-17 18:06:00 +00:00  
				
					
						
							
							
								 
						
							
							
								3fcea0f586 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #710  from matrix-org/dbkr/support_kick_ban_reasons  
							
							... 
							
							
							
							Support reasons for kick / ban 
							
						 
						
							2017-02-17 17:39:45 +00:00  
				
					
						
							
							
								 
						
							
							
								db4b9691cc 
								
							
								 
							
						 
						
							
							
								
								Support reasons for kick / ban  
							
							... 
							
							
							
							Don't ban me for fun, girl
Let me be the one, girl
Ban me for a reason
Let the reason be love. 
							
						 
						
							2017-02-17 17:27:46 +00:00  
				
					
						
							
							
								 
						
							
							
								10534e7df4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #709  from matrix-org/dbkr/show_when_banned  
							
							... 
							
							
							
							Show when you've been kicked or banned 
							
						 
						
							2017-02-17 16:48:59 +00:00  
				
					
						
							
							
								 
						
							
							
								b18473ccb2 
								
							
								 
							
						 
						
							
							
								
								Handle there being no member event when banned  
							
							... 
							
							
							
							Here, and also in MemberEventListSummary where this also broke. 
							
						 
						
							2017-02-17 16:35:18 +00:00  
				
					
						
							
							
								 
						
							
							
								1f5fdf7945 
								
							
								 
							
						 
						
							
							
								
								Get a member object, not the user object  
							
							
							
						 
						
							2017-02-17 16:14:51 +00:00  
				
					
						
							
							
								 
						
							
							
								a3aea6ba2d 
								
							
								 
							
						 
						
							
							
								
								Swap rejoin / forget  
							
							
							
						 
						
							2017-02-17 16:11:20 +00:00  
				
					
						
							
							
								 
						
							
							
								9f9de46b10 
								
							
								 
							
						 
						
							
							
								
								Add onForgetClick proptype  
							
							
							
						 
						
							2017-02-17 16:09:25 +00:00  
				
					
						
							
							
								 
						
							
							
								5abcb91e0d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #708  from matrix-org/kegan/clear-cache  
							
							... 
							
							
							
							Add a 'Clear Cache' button 
							
						 
						
							2017-02-17 15:51:08 +00:00  
				
					
						
							
							
								 
						
							
							
								de4773ba93 
								
							
								 
							
						 
						
							
							
								
								Show when you've been kicked or banned  
							
							... 
							
							
							
							Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason. 
							
						 
						
							2017-02-17 15:50:30 +00:00  
				
					
						
							
							
								 
						
							
							
								8d6c3cd3f4 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							2017-02-17 15:37:49 +00:00  
				
					
						
							
							
								 
						
							
							
								0a31efa0b7 
								
							
								 
							
						 
						
							
							
								
								Add a 'Clear Cache' button  
							
							... 
							
							
							
							This deletes the IndexedDB database and reloads the page.
This solely exists as a get-out clause for users in case the indexedDB instance
gets corrupted. Hopefully we won't ever need to point users to it. 
							
						 
						
							2017-02-17 15:16:28 +00:00  
				
					
						
							
							
								 
						
							
							
								775834b707 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #707  from matrix-org/dbkr/update_on_room_name  
							
							... 
							
							
							
							Update the room view on room name change 
							
						 
						
							2017-02-17 15:10:36 +00:00  
				
					
						
							
							
								 
						
							
							
								a3746ea1b6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name  
							
							
							
						 
						
							2017-02-17 14:41:54 +00:00  
				
					
						
							
							
								 
						
							
							
								97722af3d6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #698  from matrix-org/dbkr/add_unban_button  
							
							... 
							
							
							
							Add a button to un-ban users in RoomSettings 
							
						 
						
							2017-02-17 12:46:00 +00:00  
				
					
						
							
							
								 
						
							
							
								cc11b3eadc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #687  from matrix-org/kegan/indexeddb  
							
							... 
							
							
							
							Use IndexedDBStore from the JS-SDK 
							
						 
						
							2017-02-17 11:59:44 +00:00  
				
					
						
							
							
								 
						
							
							
								b2344ceb74 
								
							
								 
							
						 
						
							
							
								
								Update the room view on room name change  
							
							
							
						 
						
							2017-02-17 11:44:56 +00:00  
				
					
						
							
							
								 
						
							
							
								cca266c62c 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							2017-02-17 10:43:55 +00:00  
				
					
						
							
							
								 
						
							
							
								4753552ddc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #706  from matrix-org/luke/fix-team-token-referral-link  
							
							... 
							
							
							
							Make UserSettings use the right teamToken 
							
						 
						
							2017-02-16 18:12:46 +00:00  
				
					
						
							
							
								 
						
							
							
								b13e6ca022 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #705  from matrix-org/luke/rts-default-goto-directory  
							
							... 
							
							
							
							If the home page is somehow accessed, goto directory 
							
						 
						
							2017-02-16 18:10:56 +00:00  
				
					
						
							
							
								 
						
							
							
								406c34b715 
								
							
								 
							
						 
						
							
							
								
								Make UserSettings use the right teamToken  
							
							... 
							
							
							
							This threads the correct teamToken through to UserSettings for generating the referral section. 
							
						 
						
							2017-02-16 18:00:52 +00:00  
				
					
						
							
							
								 
						
							
							
								9d2bb70823 
								
							
								 
							
						 
						
							
							
								
								If the home page is somehow accessed, goto directory  
							
							... 
							
							
							
							For example, if someone ends up on /home somehow, just redirect to the directory instead of displaying a very awkward "File not found" plain text in the home page iFrame. 
							
						 
						
							2017-02-16 17:03:22 +00:00  
				
					
						
							
							
								 
						
							
							
								53f3b5780e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into kegan/indexeddb  
							
							
							
						 
						
							2017-02-16 16:10:23 +00:00  
				
					
						
							
							
								 
						
							
							
								6945e7c154 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #699  from matrix-org/luke/fix-avatar-initials  
							
							... 
							
							
							
							Display avatar initials in typing notifications 
							
						 
						
							2017-02-16 14:06:05 +00:00  
				
					
						
							
							
								 
						
							
							
								fe4a28b59a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #703  from aviraldg/fix-no-invalid-this  
							
							... 
							
							
							
							fix eslint's no-invalid-this rule for class properties 
							
						 
						
							2017-02-16 13:26:31 +00:00  
				
					
						
							
							
								 
						
							
							
								f07da44aa5 
								
							
								 
							
						 
						
							
							
								
								Don't handle logs db: It needs to close its connections first  
							
							
							
						 
						
							2017-02-16 12:42:45 +00:00  
				
					
						
							
							
								 
						
							
							
								0e66b370d4 
								
									
								
							
								 
							
						 
						
							
							
								
								fix eslint's no-invalid-this rule for class properties  
							
							
							
						 
						
							2017-02-16 16:49:00 +05:30  
				
					
						
							
							
								 
						
							
							
								1f77534b32 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #701  from matrix-org/luke/rts-allow-non-referrals  
							
							... 
							
							
							
							If a referrer hasn't been specified, use empty string 
							
						 
						
							2017-02-16 10:42:27 +00:00  
				
					
						
							
							
								 
						
							
							
								74487c655d 
								
							
								 
							
						 
						
							
							
								
								If a referrer hasn't been specified, use empty string  
							
							... 
							
							
							
							This is interpretted by the RTS as a non-referred team member who still needs the team token to access their welcome page etc. 
							
						 
						
							2017-02-16 09:22:44 +00:00  
				
					
						
							
							
								 
						
							
							
								ebe7ec4000 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename RTE labs option to "New Composer & Autocomplete"  
							
							... 
							
							
							
							As per confusion around https://riot.im/develop/#/room/!DdJkzRliezrwpNebLk:matrix.org/$1487091505948TmtGn:t2l.io  
							
						 
						
							2017-02-16 02:20:34 +05:30  
				
					
						
							
							
								 
						
							
							
								5769213647 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #700  from matrix-org/rav/no_logout_on_localstorage_fail  
							
							... 
							
							
							
							Don't force-logout the user if reading localstorage fails 
							
						 
						
							2017-02-15 19:59:30 +00:00  
				
					
						
							
							
								 
						
							
							
								bdb8f9d052 
								
							
								 
							
						 
						
							
							
								
								Don't force-logout the user if reading localstorage fails  
							
							... 
							
							
							
							Give them a modal dialog to give them a chance to abort. 
							
						 
						
							2017-02-15 19:33:39 +00:00