Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							12db0d9130 
							
						 
					 
					
						
						
							
							fix NPE on events with no sender object  
						
						
						
						
					 
					
						2016-03-18 16:33:22 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d0ecd38927 
							
						 
					 
					
						
						
							
							top-align search results  
						
						
						
						
					 
					
						2016-03-18 16:25:11 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							15c9ad87a1 
							
						 
					 
					
						
						
							
							Merge pull request  #231  from matrix-org/rav/pending_event_list  
						
						... 
						
						
						
						Use new pendingEventList functionality from matrix-js-sdk 
						
						
					 
					
						2016-03-18 16:17:56 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							03de19cd27 
							
						 
					 
					
						
						
							
							Merge pull request  #233  from matrix-org/dbkr/show_invited_email  
						
						... 
						
						
						
						Display a warning if a third party invite for a room was sent to an address that is not bound publicly to our account 
						
						
					 
					
						2016-03-18 16:08:27 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							076bd720a3 
							
						 
					 
					
						
						
							
							Spell address correctly  
						
						
						
						
					 
					
						2016-03-18 16:07:32 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							eb5aa7ed7d 
							
						 
					 
					
						
						
							
							Move comment  
						
						
						
						
					 
					
						2016-03-18 16:06:36 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1cf0661e 
							
						 
					 
					
						
						
							
							Bump to latest react-gemini-scrollbar build  
						
						... 
						
						
						
						Hopefully this will https://github.com/vector-im/vector-web/issues/1186  and
some other bugs. 
						
						
					 
					
						2016-03-18 16:06:12 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b4dd7ba509 
							
						 
					 
					
						
						
							
							I mean string, object  
						
						
						
						
					 
					
						2016-03-18 16:04:58 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							3e915cf0e2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email  
						
						
						
						
					 
					
						2016-03-18 15:34:15 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							97c765f457 
							
						 
					 
					
						
						
							
							Look up bound mxid for the invited email address on the ID server and warn if it doesn't match our account.  
						
						
						
						
					 
					
						2016-03-18 15:30:27 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cf7acbc9 
							
						 
					 
					
						
						
							
							Merge pull request  #232  from matrix-org/matthew/fix-modals  
						
						... 
						
						
						
						Fix cancelling dialog boxes by clicking on the background 
						
						
					 
					
						2016-03-18 12:12:16 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							03bdcf265a 
							
						 
					 
					
						
						
							
							fix proptypes on dialogs  
						
						
						
						
					 
					
						2016-03-18 11:20:00 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							deaa5c350a 
							
						 
					 
					
						
						
							
							Remove unnecessary Modal.createDialogWithElement, complete with its broken onFinished() support. Switch SetDisplayNameDialog to use Modal.createDialog(). Explicitly pass false to closeDialog if the user tries to cancel dialogs by clicking on the background, rather than passing in an event object which evaluates to true.  
						
						
						
						
					 
					
						2016-03-18 11:15:06 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e63990a66e 
							
						 
					 
					
						
						
							
							ensure we call onFinished successfully if the user actually hits submit  
						
						
						
						
					 
					
						2016-03-18 11:12:37 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d0d22136f5 
							
						 
					 
					
						
						
							
							remove totally dead wood from stale Modal API  
						
						
						
						
					 
					
						2016-03-18 11:12:06 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b93af2d536 
							
						 
					 
					
						
						
							
							Use new pendingEventList functionality from matrix-js-sdk  
						
						... 
						
						
						
						Update react-sdk to use `pendingEventOrdering`==`detached` instead of
`end`. Look for pending events in the pendingEvent list, and use
MatrixClient.cancelPendingEvent to, uh, cancel pending events. 
						
						
					 
					
						2016-03-17 22:26:06 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e55a375d6f 
							
						 
					 
					
						
						
							
							improve RoomPreviewBar as per  https://github.com/vector-im/vector-web/issues/761  
						
						
						
						
					 
					
						2016-03-17 19:19:05 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							cb4bbc04e0 
							
						 
					 
					
						
						
							
							fix leaked user_id on various textual events  
						
						
						
						
					 
					
						2016-03-17 19:05:39 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							be5173a8db 
							
						 
					 
					
						
						
							
							fix  https://github.com/vector-im/vector-web/issues/871  
						
						
						
						
					 
					
						2016-03-17 18:49:40 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							396d23b267 
							
						 
					 
					
						
						
							
							kill annoying warning  
						
						
						
						
					 
					
						2016-03-17 18:49:40 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							f1844a99e7 
							
						 
					 
					
						
						
							
							WIP on fixing  https://github.com/vector-im/vector-web/issues/924  
						
						... 
						
						
						
						Pass the invited email through to RoomPreviewBar, display it in a temporary way currently.
Remove a condition from RoomView render that appears to be functionally identical to the previous. 
						
						
					 
					
						2016-03-17 18:38:25 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d1dbce8adf 
							
						 
					 
					
						
						
							
							Enable debug in ScrollPanel for now  
						
						... 
						
						
						
						... in an attempt to debug some of the recent scroll problems 
						
						
					 
					
						2016-03-17 17:48:19 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							57ffc2d2e2 
							
						 
					 
					
						
						
							
							add autoFocus to MessageComposer's textarea, which generally makes the world a better place. We could probably kill all the focus_composer dispatches too, but haven't got time to check that right now  
						
						
						
						
					 
					
						2016-03-17 17:29:48 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							092c416a89 
							
						 
					 
					
						
						
							
							ugh, get rid of accidental debugging  
						
						
						
						
					 
					
						2016-03-17 17:25:48 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							3caa8f19c1 
							
						 
					 
					
						
						
							
							Merge pull request  #229  from matrix-org/matthew/fix-zero-length-tab-complete  
						
						... 
						
						
						
						fix zero length tab complete so it doesn't fire automatically on empty MessageComposer 
						
						
					 
					
						2016-03-17 17:11:53 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							cbf0349855 
							
						 
					 
					
						
						
							
							Merge pull request  #230  from matrix-org/matthew/insert-displayname  
						
						... 
						
						
						
						click on nicks to insert them into the MessageComposer 
						
						
					 
					
						2016-03-17 17:07:02 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4e709705 
							
						 
					 
					
						
						
							
							don't need null guard  
						
						
						
						
					 
					
						2016-03-17 16:56:16 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							76d4e8a788 
							
						 
					 
					
						
						
							
							check length of textarea, not its trueiness  
						
						
						
						
					 
					
						2016-03-17 16:54:54 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							1b4c5224fd 
							
						 
					 
					
						
						
							
							missed some s/this.refs.//  
						
						
						
						
					 
					
						2016-03-17 16:52:12 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							42479cf011 
							
						 
					 
					
						
						
							
							PR feedback  
						
						
						
						
					 
					
						2016-03-17 16:46:54 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							a64ad04a0e 
							
						 
					 
					
						
						
							
							handle focus nicely when inserting displaynames and let them be inserted in the middle of in-progress messages  
						
						
						
						
					 
					
						2016-03-17 16:29:37 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ffb59374 
							
						 
					 
					
						
						
							
							click on nicks to insert them into the MessageComposer  
						
						
						
						
					 
					
						2016-03-17 15:35:23 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							4a90f262c6 
							
						 
					 
					
						
						
							
							fix zero length tab complete behaviour  
						
						
						
						
					 
					
						2016-03-17 15:34:40 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							a13513935b 
							
						 
					 
					
						
						
							
							only show '...' when people are typing  
						
						
						
						
					 
					
						2016-03-17 15:02:07 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							9dcdf0ae51 
							
						 
					 
					
						
						
							
							Merge pull request  #227  from matrix-org/matthew/fix-notif-spam  
						
						... 
						
						
						
						Correctly fix notif spam after logout/login 
						
						
					 
					
						2016-03-17 14:37:01 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							c51dac2f29 
							
						 
					 
					
						
						
							
							Merge pull request  #226  from matrix-org/matthew/fix-last-active  
						
						... 
						
						
						
						fix last_active_ago timestamps, tab completion ordering, and implement currently_active semantics 
						
						
					 
					
						2016-03-17 14:36:52 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							a68e4ed1a7 
							
						 
					 
					
						
						
							
							Merge pull request  #222  from matrix-org/matthew/fix-memberlist-refresh  
						
						... 
						
						
						
						make MemberTiles actually update in realtime 
						
						
					 
					
						2016-03-17 11:59:24 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b617571481 
							
						 
					 
					
						
						
							
							tidy up  https://github.com/matrix-org/matrix-react-sdk/pull/225  
						
						
						
						
					 
					
						2016-03-17 11:56:46 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e03d8626be 
							
						 
					 
					
						
						
							
							Merge pull request  #225  from aviraldg/fix-1174  
						
						... 
						
						
						
						Bring up MemberInfo on avatar click in EventTile 
						
						
					 
					
						2016-03-17 11:48:32 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							59eab23af6 
							
						 
					 
					
						
						
							
							Merge pull request  #228  from matrix-org/dbkr/fix_email_validation_hs_url  
						
						... 
						
						
						
						Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar 
						
						
					 
					
						2016-03-17 11:39:55 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							84278a4ed4 
							
						 
					 
					
						
						
							
							fix copy-paste bug caught by PR review  
						
						
						
						
					 
					
						2016-03-17 11:37:26 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							810f72ce2c 
							
						 
					 
					
						
						
							
							suppress notification floods again after returning from error state  
						
						
						
						
					 
					
						2016-03-17 11:34:20 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b960d1d462 
							
						 
					 
					
						
						
							
							Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar.  
						
						... 
						
						
						
						Fixes @ara4n's later bug in https://github.com/vector-im/vector-web/issues/1027  
						
						
					 
					
						2016-03-17 11:33:25 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							577a7e3f06 
							
						 
					 
					
						
						
							
							Merge pull request  #223  from matrix-org/dbkr/poll_for_email_validation  
						
						... 
						
						
						
						Poll for email validation once the validation email has been sent 
						
						
					 
					
						2016-03-17 10:50:38 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							1637c36589 
							
						 
					 
					
						
						
							
							release script for react-sdk  
						
						
						
						
					 
					
						2016-03-17 10:45:26 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							0471a1e022 
							
						 
					 
					
						
						
							
							Comment why we're storing the session id  
						
						
						
						
					 
					
						2016-03-17 09:42:52 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							3326a50c4b 
							
						 
					 
					
						
						
							
							hopefully stop weird flickering bugs when pressing delete or zero-height textareas...  
						
						
						
						
					 
					
						2016-03-17 02:17:17 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e9b0539b58 
							
						 
					 
					
						
						
							
							hopefully stop weird flickering bugs when pressing delete or zero-height textareas...  
						
						
						
						
					 
					
						2016-03-17 02:16:39 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							08618f6ad5 
							
						 
					 
					
						
						
							
							remove start_login_from_guest and instead make logout able to preserve guestCreds  
						
						
						
						
					 
					
						2016-03-17 02:09:49 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							380d466472 
							
						 
					 
					
						
						
							
							correctly fix notif spam after logout/login:  https://github.com/vector-im/vector-web/issues/809  
						
						
						
						
					 
					
						2016-03-17 02:06:47 +00:00